Merge branch 'develop_3' into 'develop_master'

feat: 登陆修改

See merge request !13

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;
+    }
+
 
     /**
      * 刘寅楠