From 8b8e76c8a5009ebe96bdfc54adc5cc72b9f24512 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Sat, 15 Apr 2023 17:03:29 +0800
Subject: [PATCH] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E7=94=A8=E6=88=B7=E7=BB=99?=
 =?UTF-8?q?=E4=B8=80=E7=BA=A7=E9=83=A8=E9=97=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/auth/SysUserController.java    | 25 ++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/auth/SysUserController.java b/src/main/java/com/glxp/api/controller/auth/SysUserController.java
index d98b8189..6d97faae 100644
--- a/src/main/java/com/glxp/api/controller/auth/SysUserController.java
+++ b/src/main/java/com/glxp/api/controller/auth/SysUserController.java
@@ -55,6 +55,9 @@ public class SysUserController extends BaseController {
     @Resource
     private AuthAdminService authAdminService;
 
+    @Resource
+    private DeptService deptService;
+
     @GetMapping("/list")
     public BaseResponse list(FilterAuthUserRequest filterAuthUserRequest, BindingResult bindingResult) {
 
@@ -77,10 +80,16 @@ public class SysUserController extends BaseController {
                 List<Long> depts = new ArrayList<>();
                 String deptName = "";
                 for (DeptUserResponse deptUserResponse : deptUserResponses) {
-                    depts.add(deptUserResponse.getDeptId());
-                    deptName = deptName + "," + deptUserResponse.getDeptName();
+                    if(deptUserResponse.getDeptId()!=1){
+                        depts.add(deptUserResponse.getDeptId());
+                        deptName = deptName + "," + deptUserResponse.getDeptName();
+                    }
+                }
+                if(deptName.length()!=0){
+                    authAdminResponse.setDeptName(deptName.substring(1));
+                }else{
+                    authAdminResponse.setDeptName(deptName);
                 }
-                authAdminResponse.setDeptName(deptName.substring(1));
                 authAdminResponse.setDepts(depts);
             }
             authAdminResponse.setRoles(roles);
@@ -199,6 +208,11 @@ public class SysUserController extends BaseController {
 //        sysUserRole.setUserId(authAdmin.getId());
 //        sysUserRole.setRoleId(sysUserRole1.getRoleId());
 //        userService.insertUserAuth1(sysUserRole);
+        //默认插入第一部门
+        List<Long> deptCodeList=authUserSaveRequest.getDepts();
+        deptCodeList.add(1L);
+        authUserSaveRequest.setDepts(deptCodeList);
+
 
 
         //插入部门
@@ -276,6 +290,11 @@ public class SysUserController extends BaseController {
         userService.updateAuthAdmin(authAdmin);
 
 
+        //默认插入第一部门
+        List<Long> deptCodeList=authUserSaveRequest.getDepts();
+        deptCodeList.add(1L);
+        authUserSaveRequest.setDepts(deptCodeList);
+
         //修改所属部门
         deptUserService.deleteByUser(authUserSaveRequest.getId());
         if (CollUtil.isNotEmpty(authUserSaveRequest.getDepts())) {