From c50e176c4a6b9331d2d1c0520bafb18f54f0dee6 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 08 三月 2024 17:35:10 +0800
Subject: [PATCH] 部门增加管理员
---
src/main/java/com/mindskip/xzs/service/impl/DepartmentServiceImpl.java | 45 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 39 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/service/impl/DepartmentServiceImpl.java b/src/main/java/com/mindskip/xzs/service/impl/DepartmentServiceImpl.java
index 0c737eb..d138d98 100644
--- a/src/main/java/com/mindskip/xzs/service/impl/DepartmentServiceImpl.java
+++ b/src/main/java/com/mindskip/xzs/service/impl/DepartmentServiceImpl.java
@@ -5,11 +5,13 @@
import com.github.pagehelper.PageInfo;
import com.mindskip.xzs.domain.Department;
import com.mindskip.xzs.domain.UserDepartment;
+import com.mindskip.xzs.domain.enums.DeptAdminEnum;
import com.mindskip.xzs.domain.vo.BaseSelect;
import com.mindskip.xzs.domain.vo.UpdateDeptAdminVO;
import com.mindskip.xzs.repository.BaseMapper;
import com.mindskip.xzs.repository.DepartmentMapper;
import com.mindskip.xzs.repository.UserDepartmentMapper;
+import com.mindskip.xzs.repository.UserMapper;
import com.mindskip.xzs.service.DepartmentService;
import com.mindskip.xzs.utility.ModelMapperSingle;
import com.mindskip.xzs.viewmodel.admin.department.DepartmentResponseVM;
@@ -27,11 +29,13 @@
private final DepartmentMapper departmentMapper;
private final UserDepartmentMapper userDepartmentMapper;
+ private final UserMapper userMapper;
- public DepartmentServiceImpl(BaseMapper<Department> baseMapper, DepartmentMapper departmentMapper, UserDepartmentMapper userDepartmentMapper) {
+ public DepartmentServiceImpl(BaseMapper<Department> baseMapper, DepartmentMapper departmentMapper, UserDepartmentMapper userDepartmentMapper, UserMapper userMapper) {
super(baseMapper);
this.departmentMapper = departmentMapper;
this.userDepartmentMapper = userDepartmentMapper;
+ this.userMapper = userMapper;
}
@Override
@@ -54,7 +58,24 @@
@Override
public Integer update(Department department) {
// userDepartmentMapper.removeByDepartmentId(department.getId());
- return departmentMapper.update(department);
+ Department entity = departmentMapper.getById(department.getId());
+ if (Objects.isNull(entity)) {
+ throw new RuntimeException("璇ラ儴闂ㄤ笉瀛樺湪");
+ }
+ if (Objects.nonNull(department.getAdminId())) {
+ if (! Objects.equals(entity.getAdminId(), department.getAdminId())) {
+ // 鍙栨秷鍘熷厛鐨勭鐞嗗憳鏍囪瘑
+ List<Integer> depIds = departmentMapper.selectByAdminId(entity.getAdminId());
+ depIds.remove(department.getId());
+ if (depIds.size() < 1) {
+ userMapper.updateDeptAdmin(entity.getAdminId(), DeptAdminEnum.NO.getValue());
+ }
+ }
+ // 鏍囪瘑閮ㄩ棬绠＄悊鍛�
+ userMapper.updateDeptAdmin(department.getAdminId(), DeptAdminEnum.YES.getValue());
+ }
+ Integer update = departmentMapper.update(department);
+ return update;
}
@Override
@@ -91,11 +112,23 @@
@Override
public void updateAdmin(UpdateDeptAdminVO form) {
- Department department = departmentMapper.getById(form.getId());
- if (Objects.isNull(department)) {
+ Department entity = departmentMapper.getById(form.getId());
+ if (Objects.isNull(form)) {
throw new RuntimeException("璇ラ儴闂ㄤ笉瀛樺湪");
}
- department.setAdminId(form.getDeptAdmin());
- departmentMapper.update(department);
+ if (Objects.nonNull(form.getAdminId())) {
+ if (! Objects.equals(entity.getAdminId(), form.getAdminId())) {
+ // 鍙栨秷鍘熷厛鐨勭鐞嗗憳鏍囪瘑
+ List<Integer> depIds = departmentMapper.selectByAdminId(entity.getAdminId());
+ depIds.remove(form.getId());
+ if (depIds.size() < 1) {
+ userMapper.updateDeptAdmin(entity.getAdminId(), DeptAdminEnum.NO.getValue());
+ }
+ }
+ // 鏍囪瘑閮ㄩ棬绠＄悊鍛�
+ userMapper.updateDeptAdmin(form.getAdminId(), DeptAdminEnum.YES.getValue());
+ }
+ entity.setAdminId(form.getAdminId());
+ departmentMapper.update(entity);
}
}
--
Gitblit v1.8.0