From 9531c3e6b91d1f9240804f6d0d604d6b6f2ee620 Mon Sep 17 00:00:00 2001
From: ALW <850658129@qq.com>
Date: Thu, 18 Aug 2022 11:02:43 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E6=96=B0=E5=A2=9E=E4=B8=80=E4=B8=AA=E8=B4=A8=E6=8E=A7?=
 =?UTF-8?q?=E7=A7=91=E5=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/manage/controller/LoginController.java    | 15 +++++++++++++++
 power-admin/src/main/webapp/static/js/user.js     | 13 ++++++-------
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/power-admin/src/main/java/com/manage/controller/LoginController.java b/power-admin/src/main/java/com/manage/controller/LoginController.java
index 3d5e301..9657ae5 100644
--- a/power-admin/src/main/java/com/manage/controller/LoginController.java
+++ b/power-admin/src/main/java/com/manage/controller/LoginController.java
@@ -131,6 +131,21 @@ public class LoginController {
                     }
                 }
                 user.setRemark(power_depts.toString());
+                StringBuilder power_depts3 = new StringBuilder();
+                if (!user.getDeptIdQuality().equals(null)){
+                    List<Power_Dept> power_depts2 = power_deptService.selectByPrimaryKeys(user.getDeptIdQuality());
+                    for(int a=0;a<power_depts2.size();a++){
+                        String deptCode = power_depts2.get(a).getDeptCode();
+                        System.out.println("deptCode:::"+deptCode);
+                        if(a<power_depts2.size()-1){
+                            power_depts3.append(power_depts2.get(a).getDeptCode()).append(",");
+                        }else{
+                            power_depts3.append(power_depts2.get(a).getDeptCode());
+                        }
+                    }
+                    user.setDeptIdQuality(power_depts3.toString());
+                }
+
                 //设置进缓存
                 CacheManager.putCache(token,new Cache(date,user,TOKEN_EXPIRE_TIME));
                 ActionScopeUtils.setSessionAttribute("CURRENT_USER",user,Integer.valueOf(String.valueOf(TOKEN_EXPIRE_TIME))/1000);
diff --git a/power-admin/src/main/webapp/static/js/user.js b/power-admin/src/main/webapp/static/js/user.js
index 43e2fa1..84222b2 100644
--- a/power-admin/src/main/webapp/static/js/user.js
+++ b/power-admin/src/main/webapp/static/js/user.js
@@ -309,10 +309,6 @@ function edit(id){
              var deptArr = deptIds.split(",");
              $('#deptId').selectpicker('val', deptArr);
 
-
-             var deptIds1 = data.deptIdQuality;
-             var deptArr1 = deptIds1.split(",");
-             $('#deptIdQuality').selectpicker('val', deptArr1);
              if(data.userSex == 1){
                  $("#re_userSex").val("1");
              }else{
@@ -325,11 +321,14 @@ function edit(id){
              $("#txtTreeSelect1").val(data.powerDepts);
              $("#deptIdQuality").val(data.deptIdQuality);
              $("#deptIds").val(data.deptId);
-             if (deptIds!="16"){
+             if (data.deptId!="16"){
                  $("#deptIdAdmin").css("display","none")
-                 console.log($("#deptIdAdmin"))
-             }else {
+             }else if (data.deptId=="16"){
                  $("#deptIdAdmin").css("display","block")
+                 var deptIds1 = data.deptIdQuality;
+                     var deptArr1 = deptIds1.split(",");
+                     $('#deptIdQuality').selectpicker('val', deptArr1);
+
              }
              $("#re_roleId").find("option[value='"+data.roleId+"']").attr("selected",true);
              $("#re_effective").find("option[value='"+data.effective+"']").attr("selected",true);