From b7140393f4e354ae4b5198f3298c15491ccd8dde Mon Sep 17 00:00:00 2001
From: liuxm <liuxm@fescotech.com>
Date: 星期三, 08 五月 2024 10:09:10 +0800
Subject: [PATCH] 权限验证方法修改;保存用户去掉默认不禁用

---
 pms-parent/pms-common/src/main/java/com/dy/common/aop/SsoPowerAspect.java |   13 ++++++++++---
 pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/UserCtrl.java   |    2 +-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/pms-parent/pms-common/src/main/java/com/dy/common/aop/SsoPowerAspect.java b/pms-parent/pms-common/src/main/java/com/dy/common/aop/SsoPowerAspect.java
index 6846bc1..5a6a088 100644
--- a/pms-parent/pms-common/src/main/java/com/dy/common/aop/SsoPowerAspect.java
+++ b/pms-parent/pms-common/src/main/java/com/dy/common/aop/SsoPowerAspect.java
@@ -22,6 +22,7 @@
 import org.springframework.web.util.UriComponentsBuilder;
 
 import java.lang.reflect.Method;
+import java.util.Arrays;
 import java.util.Objects;
 /**
  * 楠岃瘉鏄惁鐧诲綍鍚屾椂锛屼篃楠岃瘉鏉冮檺
@@ -111,9 +112,9 @@
         if(!StringUtils.isNullOrEmpty(SsoCheckUrl)){
             String url = UriComponentsBuilder.fromUriString(SsoCheckUrl)
                     .queryParam("token", token)
-                    .queryParam("power", power)
-                    .queryParam("allPower", (Object) allPower)
-                    .queryParam("anyPower", (Object) anyPower)
+                    .queryParam("privilege", power)
+                    .queryParam("allPrivilege", arraysToString(allPower))
+                    .queryParam("anyPrivilege", arraysToString(anyPower))
                     .build()
                     .toUriString();
             HttpHeaders headers = new HttpHeaders();
@@ -132,4 +133,10 @@
         }
     }
 
+    public String arraysToString(String[] stringArray) {
+        String str = Arrays.toString(stringArray);
+        // 鍚屾椂绉婚櫎寮�澶寸殑 "[" 鍜岀粨灏剧殑 "]"
+        return str.substring(1, str.length() - 1);
+    }
+
 }
diff --git a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/UserCtrl.java b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/UserCtrl.java
index 95d9d64..011ac5b 100644
--- a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/UserCtrl.java
+++ b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/UserCtrl.java
@@ -109,7 +109,7 @@
         Long id;
         try {
             po.supperAdmin = Constant.no.byteValue() ;
-            po.disabled = false ;//榛樿涓嶇鐢�
+//            po.disabled = false ;//榛樿涓嶇鐢�
             po.deleted = false;//榛樿涓嶅垹闄�
             if (!StringUtils.isNullOrEmpty(po.password)) {
                 /*

--
Gitblit v1.8.0