From ca4e8f1df6b80fa5d09fdd2dd4071d9976d10e59 Mon Sep 17 00:00:00 2001 From: wanggeng <450292408@qq.com> Date: Thu, 7 Apr 2022 09:58:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DepartmentAdjustmentServiceImpl.java | 7 ++++++- .../department/service/impl/DepartmentUserServiceImpl.java | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentAdjustmentServiceImpl.java b/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentAdjustmentServiceImpl.java index 6330cb9a..56985f3c 100644 --- a/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentAdjustmentServiceImpl.java +++ b/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentAdjustmentServiceImpl.java @@ -3,6 +3,7 @@ package ink.wgink.service.department.service.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import ink.wgink.common.base.DefaultBaseService; +import ink.wgink.interfaces.consts.ISystemConstant; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.dtos.user.UserDTO; import ink.wgink.pojo.result.SuccessResultList; @@ -59,7 +60,11 @@ public class DepartmentAdjustmentServiceImpl extends DefaultBaseService implemen } List userDTOs = userService.listByUserIds(userIds); Map params = new HashMap<>(16); - params.put("creatorName", securityComponent.getCurrentUser().getUserName()); + if (securityComponent.getCurrentUser() != null) { + params.put("creatorName", securityComponent.getCurrentUser().getUserName()); + } else { + params.put("creatorName", ISystemConstant.ADMIN); + } setSaveInfo(params); for (UserDTO userDTO : userDTOs) { params.put("userId", userDTO.getUserId()); diff --git a/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentUserServiceImpl.java b/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentUserServiceImpl.java index 9e41c455..64f7d013 100644 --- a/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentUserServiceImpl.java +++ b/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentUserServiceImpl.java @@ -76,7 +76,7 @@ public class DepartmentUserServiceImpl extends DefaultBaseService implements IDe i--; } } - departmentAdjustmentService.save(departmentUserIds, departmentId, departmentName, USER_DEPARTMENT_TYPE_JOIN); + departmentAdjustmentService.save(existUserIds, departmentId, departmentName, USER_DEPARTMENT_TYPE_JOIN); if (departmentUserSaveAfterHandler != null) { departmentUserSaveAfterHandler.handle(departmentId, departmentUserIds); }