From 0e7a27ebc4163e6dfe06b77cb3f1dd03c03721a7 Mon Sep 17 00:00:00 2001 From: nies Date: Thu, 25 Nov 2021 11:14:14 +0800 Subject: [PATCH] =?UTF-8?q?(update)=E4=BF=AE=E6=94=B9=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=8D=E6=9B=B4=E6=96=B0=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E7=9A=84=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/api/iservice/busi/ISysUserService.java | 3 +-- .../controller/busi/SysUserController.java | 2 +- .../apiservice/serviceimpl/busi/SysUserService.java | 20 +++++++++++++++----- .../src/main/resources/application.properties | 4 ++-- 4 files changed, 19 insertions(+), 10 deletions(-) diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserService.java index 7cb35ac..10405df 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserService.java @@ -61,10 +61,9 @@ public interface ISysUserService { * * @param userLoginNameList * @param status - * @param user */ @ApiOperation(value = "根据用户名批量修改账号状态", notes = "根据用户名批量修改账号状态") - void updateBatchSysUserStatusByUserLoginNames(List userLoginNameList, int status, SessionUser user); + void updateBatchSysUserStatusByUserLoginNames(List userLoginNameList, int status); /** * 修改账号信息 diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java index e72784d..74961c0 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java @@ -307,7 +307,7 @@ public class SysUserController extends CoreBaseController { } ValidatorBean.checkNotZero(status, "账号状态不能为空"); List userLoginNameList = Stream.of(userLoginNames).collect(Collectors.toList()); - sysUserService.updateBatchSysUserStatusByUserLoginNames(userLoginNameList,status,AuthUtil.getSessionUser()); + sysUserService.updateBatchSysUserStatusByUserLoginNames(userLoginNameList,status); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java index 59d2143..98cb5fe 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java @@ -223,16 +223,26 @@ public class SysUserService implements ISysUserService { } @Override - public void updateBatchSysUserStatusByUserLoginNames(List userLoginNameList, int status, SessionUser user) { - LOGGER.debug("平台用户 SYS_USER UPDATE By userLoginNames :{} status:{}, SessionUser :{}", userLoginNameList, status, user); + public void updateBatchSysUserStatusByUserLoginNames(List userLoginNameList, int status) { DdlPackBean ddlPackBean = new DdlPackBean(); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", ddlPackBean); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", ddlPackBean); DdlPreparedPack.getInPackList(userLoginNameList, "userLoginName", ddlPackBean); + String modifiedUser = "系统"; + try { + modifiedUser = AuthUtil.getSessionUser().getUserName(); + } catch (Exception e) { - userRDao.updateByPropertiesWithVal(new String[]{"userStatus"},new Object[]{1},ddlPackBean); - LOGGER.debug("平台用户 SYS_USER UPDATE By SessionUser :{} 成功", user); + } + userRDao.updateByProperties( + new String[]{"userStatus", "modifyDatetime", "modifyUser"}, + new Object[]{status, TimeTool.getNowTime(true), modifiedUser}, + ddlPackBean); +// userRDao.updateByProperties( +// new String[]{"userStatus", "modifyUser"}, +// new Object[]{status, modifiedUser}, +// ddlPackBean); } @Override @@ -615,7 +625,7 @@ public class SysUserService implements ISysUserService { public List findSysRefUserRoleMenuByUserId(Long userId) { List roleList = findSysRefUserRoleByUserId(userId); if (ObjectUtils.isEmpty(roleList)) { - return null; + return null; } List roleIdList = roleList.stream().map(el -> el.getRoleId()).collect(Collectors.toList()); List menuList = roleService.findSysRefRoleMenuByRoleIdList(roleIdList); diff --git a/modules/i3plus-core-apiservice/src/main/resources/application.properties b/modules/i3plus-core-apiservice/src/main/resources/application.properties index 80d6f6a..c3963a9 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/application.properties +++ b/modules/i3plus-core-apiservice/src/main/resources/application.properties @@ -1,11 +1,11 @@ #\u4F7F\u7528\u914D\u7F6E -spring.profiles.active=docker +spring.profiles.active=test #\u9879\u76EE\u63CF\u8FF0\u4FE1\u606F\uFF08swagger\u4E2D\u663E\u5F0F\uFF09\uFF0C\u4E2D\u6587\u4F7F\u7528uncode\u8F6C\u7801 desc.application.name=\u6838\u5FC3\u7BA1\u7406\u540E\u53F0 ######### \u81EA\u5B9A\u4E49\u53C2\u6570 ######### #\u9879\u76EE\u540D\u79F0 -spring.application.name=${project.name} +spring.application.name=${project.name}-ns #\u5F53\u524D\u9879\u76EE\u7248\u672C version=${project.version} #\u89E3\u51B3\u7A0B\u5E8F\u8BFB\u914D\u7F6E\u6587\u4EF6\u4E71\u7801\u95EE\u9898