From 3e6b676e210e22e4b7b4183d908dbca880093b86 Mon Sep 17 00:00:00 2001
From: qirong <2032486488@qq.com>
Date: 星期五, 27 十月 2023 13:33:42 +0800
Subject: [PATCH] 部门修改

---
 src/main/java/com/mindskip/xzs/controller/admin/UserController.java |   50 ++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/mindskip/xzs/controller/admin/UserController.java b/src/main/java/com/mindskip/xzs/controller/admin/UserController.java
index 2464866..cb8aad7 100644
--- a/src/main/java/com/mindskip/xzs/controller/admin/UserController.java
+++ b/src/main/java/com/mindskip/xzs/controller/admin/UserController.java
@@ -2,11 +2,14 @@
 
 import com.mindskip.xzs.base.BaseApiController;
 import com.mindskip.xzs.base.RestResponse;
+import com.mindskip.xzs.domain.Department;
+import com.mindskip.xzs.domain.UserDepartment;
 import com.mindskip.xzs.domain.other.KeyValue;
 import com.mindskip.xzs.domain.User;
 import com.mindskip.xzs.domain.UserEventLog;
 import com.mindskip.xzs.domain.enums.UserStatusEnum;
 import com.mindskip.xzs.domain.vo.UserVO;
+import com.mindskip.xzs.repository.UserDepartmentMapper;
 import com.mindskip.xzs.service.AuthenticationService;
 import com.mindskip.xzs.service.DepartmentService;
 import com.mindskip.xzs.service.UserEventLogService;
@@ -38,20 +41,36 @@
     private final UserEventLogService userEventLogService;
     private final AuthenticationService authenticationService;
     private final DepartmentService departmentService;
+    private final UserDepartmentMapper userDepartmentMapper;
 
     @Autowired
-    public UserController(UserService userService, UserEventLogService userEventLogService, AuthenticationService authenticationService, DepartmentService departmentService) {
+    public UserController(UserService userService, UserEventLogService userEventLogService, AuthenticationService authenticationService, DepartmentService departmentService, UserDepartmentMapper userDepartmentMapper) {
         this.userService = userService;
         this.userEventLogService = userEventLogService;
         this.authenticationService = authenticationService;
         this.departmentService = departmentService;
+        this.userDepartmentMapper = userDepartmentMapper;
     }
 
 
     @RequestMapping(value = "/page/list", method = RequestMethod.POST)
     public RestResponse<PageInfo<UserResponseVM>> pageList(@RequestBody UserPageRequestVM model) {
         PageInfo<User> pageInfo = userService.userPage(model);
-        PageInfo<UserResponseVM> page = PageInfoHelper.copyMap(pageInfo, d -> UserResponseVM.from(d));
+        PageInfo<UserResponseVM> page = PageInfoHelper.copyMap(pageInfo, d ->
+                UserResponseVM.from(d));
+        page.setList(page.getList().stream().map(e->{
+            List<UserDepartment> userDepartments = userDepartmentMapper.selectByUserId(e.getId());
+            String deptIds = "";
+            for (UserDepartment userDepartment : userDepartments) {
+                Department byId = departmentService.getById(userDepartment.getDepartmentId());
+                if(byId != null){
+                    deptIds = deptIds + byId.getName();
+                    break;
+                }
+            }
+            e.setDeptNames(deptIds);
+            return e;
+        }).collect(Collectors.toList()));
         return RestResponse.ok(page);
     }
 
@@ -71,6 +90,12 @@
     public RestResponse<UserResponseVM> select(@PathVariable Integer id) {
         User user = userService.getUserById(id);
         UserResponseVM userVm = UserResponseVM.from(user);
+        List<UserDepartment> userDepartments = userDepartmentMapper.selectByUserId(user.getId());
+        String deptIds = "";
+        for (UserDepartment userDepartment : userDepartments) {
+            deptIds = deptIds + userDepartment.getDepartmentId().toString() + ",";
+        }
+        userVm.setDeptIds(deptIds.equals("") ? "" : deptIds.substring(0,deptIds.length()-1));
         return RestResponse.ok(userVm);
     }
 
@@ -115,6 +140,14 @@
             user.setModifyTime(new Date());
             userService.updateByIdFilter(user);
         }
+        userDepartmentMapper.removeByUserId(user.getId());
+        for (String s : model.getDeptIds().split(",")) {
+            UserDepartment userDepartment = new UserDepartment();
+            userDepartment.setUserId(user.getId());
+            userDepartment.setDepartmentId(Integer.parseInt(s));
+            userDepartmentMapper.insert(userDepartment);
+        }
+        user.setDeptIds(model.getDeptIds());
         return RestResponse.ok(user);
     }
 
@@ -175,4 +208,17 @@
         return RestResponse.ok();
     }
 
+    @RequestMapping(value = "/conversion", method = RequestMethod.GET)
+    public RestResponse conversion() {
+        List<User> users = userService.getUsers();
+        for (User user : users) {
+            UserDepartment userDepartment = new UserDepartment();
+            userDepartment.setUserId(user.getId());
+            userDepartment.setDepartmentId(user.getUserLevel());
+            userDepartmentMapper.insert(userDepartment);
+        }
+
+        return RestResponse.ok();
+    }
+
 }

--
Gitblit v1.8.0