From fa985d2d58942091416c5ec07d49cfb6a8c1b698 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Wed, 23 Jun 2021 15:25:41 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=99=BB=E9=99=86=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/adc/da/util/LoginUserUtil.java    | 18 ++++++++----------
 .../sys/controller/UserInfoEOController.java   | 16 +++++++++++++---
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/adc-da-base/src/main/java/com/adc/da/util/LoginUserUtil.java b/adc-da-base/src/main/java/com/adc/da/util/LoginUserUtil.java
index cc5fad43..826f7d60 100644
--- a/adc-da-base/src/main/java/com/adc/da/util/LoginUserUtil.java
+++ b/adc-da-base/src/main/java/com/adc/da/util/LoginUserUtil.java
@@ -15,17 +15,15 @@ public class LoginUserUtil {
      *
      */
     public static String getUserId() {
-        String userId = "WY8J26MH23";
+        String userId = null;
         try {
-            if(!StringUtils.isNotBlank(userId)){
-                Subject subject = SecurityUtils.getSubject();
-                Object object=subject.getPrincipal();
-                if(object!=null){
-                    String json = JSONObject.toJSONString(object);
-                    if(json!=null && json.length()>0){
-                        Map<String, Object> userInfo=JSONObject.parseObject(json, Map.class);
-                        userId=userInfo.get("id").toString();
-                    }
+            Subject subject = SecurityUtils.getSubject();
+            Object object=subject.getPrincipal();
+            if(object!=null){
+                String json = JSONObject.toJSONString(object);
+                if(json!=null && json.length()>0){
+                    Map<String, Object> userInfo=JSONObject.parseObject(json, Map.class);
+                    userId=userInfo.get("id").toString();
                 }
             }
         } catch (UnavailableSecurityManagerException e) {
diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserInfoEOController.java b/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserInfoEOController.java
index 922c0abd..b0669fd2 100644
--- a/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserInfoEOController.java
+++ b/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserInfoEOController.java
@@ -62,11 +62,11 @@ public class UserInfoEOController extends BaseController<UserInfoEO> {
     @ApiOperation(value = "查找用户信息接口")
     @GetMapping("/getByUserInfoCode")
     //@RequiresPermissions("person:userInfo:getByUserInfoCode")
-    public ResponseMessage<UserInfoEO> getByUserInfoCode() throws Exception {
+    public ResponseMessage<UserInfoEO> getByUserInfoCode(String userId) throws Exception {
         //获取当前登录人
-        String userId= LoginUserUtil.getUserId();
+//        String userId= LoginUserUtil.getUserId();
         UserInfoEO userInfoEO =new UserInfoEO();
-        userInfoEO.setUserId(userId);
+        userInfoEO.setUserId(userIdFilter(userId));
         userInfoEO.setValidFlag(ValidFlagEnum.VALID_TRUE.getValue());
         UserInfoEO getInfo = userInfoEOService.getUserEOAndInfoEOByUserCode(userInfoEO);
         if(getInfo!=null){
@@ -84,6 +84,16 @@ public class UserInfoEOController extends BaseController<UserInfoEO> {
         return Result.success(getInfo);
     }
 
+    private String userIdFilter(String str){
+        String result = "";
+        if(str.contains("?_t")){
+            result = str.split("\\?_t")[0];
+        }else {
+            result = str;
+        }
+        return result;
+    }
+
 
     /**
      * 刘寅楠