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 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 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 { @ApiOperation(value = "查找用户信息接口") @GetMapping("/getByUserInfoCode") //@RequiresPermissions("person:userInfo:getByUserInfoCode") - public ResponseMessage getByUserInfoCode() throws Exception { + public ResponseMessage 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 { 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; + } + /** * 刘寅楠