diff --git a/auth/src/main/java/com/rax/auth/support/core/RaxDaoAuthenticationProvider.java b/auth/src/main/java/com/rax/auth/support/core/RaxDaoAuthenticationProvider.java index 6363d8a..1e3146a 100644 --- a/auth/src/main/java/com/rax/auth/support/core/RaxDaoAuthenticationProvider.java +++ b/auth/src/main/java/com/rax/auth/support/core/RaxDaoAuthenticationProvider.java @@ -106,11 +106,6 @@ public class RaxDaoAuthenticationProvider extends AbstractUserDetailsAuthenticat String grantType = WebUtils.getRequest().get().getParameter(OAuth2ParameterNames.GRANT_TYPE); String clientId = WebUtils.getRequest().get().getParameter(OAuth2ParameterNames.CLIENT_ID); - Long hospitalId = Long.valueOf(WebUtils.getRequest().get().getParameter("hospitalId")); - - if (hospitalId == null) { - throw new InternalAuthenticationServiceException("hospitalId is empty"); - } if (StrUtil.isBlank(clientId)) { clientId = basicConvert.convert(request).getName(); @@ -130,7 +125,7 @@ public class RaxDaoAuthenticationProvider extends AbstractUserDetailsAuthenticat } try { - UserDetails loadedUser = optional.get().loadUserByUsername(username, hospitalId); + UserDetails loadedUser = optional.get().loadUserByUsername(username); if (loadedUser == null) { throw new InternalAuthenticationServiceException( "UserDetailsService returned null, which is an interface contract violation"); diff --git a/common/common-security/src/main/java/com/rax/common/security/service/RaxAppUserDetailsServiceImpl.java b/common/common-security/src/main/java/com/rax/common/security/service/RaxAppUserDetailsServiceImpl.java index c840144..c4e7f09 100644 --- a/common/common-security/src/main/java/com/rax/common/security/service/RaxAppUserDetailsServiceImpl.java +++ b/common/common-security/src/main/java/com/rax/common/security/service/RaxAppUserDetailsServiceImpl.java @@ -86,9 +86,4 @@ public class RaxAppUserDetailsServiceImpl implements RaxUserDetailsService { return SecurityConstants.MOBILE.equals(grantType); } - @Override - public UserDetails loadUserByUsername(String phone, Long hospitalId) { - return null; - } - } diff --git a/common/common-security/src/main/java/com/rax/common/security/service/RaxUserDetailsService.java b/common/common-security/src/main/java/com/rax/common/security/service/RaxUserDetailsService.java index 25fde87..4d15e89 100644 --- a/common/common-security/src/main/java/com/rax/common/security/service/RaxUserDetailsService.java +++ b/common/common-security/src/main/java/com/rax/common/security/service/RaxUserDetailsService.java @@ -71,7 +71,7 @@ public interface RaxUserDetailsService extends UserDetailsService, Ordered { StrUtil.equals(user.getLockFlag(), CommonConstants.STATUS_NORMAL), user.getName(), authorities); } - UserDetails loadUserByUsername(String username, Long hospitalId); + UserDetails loadUserByUsername(String username); /** * 通过用户实体查询 @@ -79,7 +79,7 @@ public interface RaxUserDetailsService extends UserDetailsService, Ordered { * @return */ default UserDetails loadUserByUser(RaxUser raxUser) { - return this.loadUserByUsername(raxUser.getUsername(), raxUser.getHospitalId()); + return this.loadUserByUsername(raxUser.getUsername()); } } diff --git a/common/common-security/src/main/java/com/rax/common/security/service/RaxUserDetailsServiceImpl.java b/common/common-security/src/main/java/com/rax/common/security/service/RaxUserDetailsServiceImpl.java index cf5eab8..54ab525 100644 --- a/common/common-security/src/main/java/com/rax/common/security/service/RaxUserDetailsServiceImpl.java +++ b/common/common-security/src/main/java/com/rax/common/security/service/RaxUserDetailsServiceImpl.java @@ -52,7 +52,7 @@ public class RaxUserDetailsServiceImpl implements RaxUserDetailsService { */ @Override @SneakyThrows - public UserDetails loadUserByUsername(String username, Long hospitalId) { + public UserDetails loadUserByUsername(String username) { Cache cache = cacheManager.getCache(CacheConstants.USER_DETAILS); if (cache != null && cache.get(username) != null) { return (RaxUser) cache.get(username).get(); @@ -60,7 +60,6 @@ public class RaxUserDetailsServiceImpl implements RaxUserDetailsService { UserDTO userDTO = new UserDTO(); userDTO.setUsername(username); - userDTO.setHospitalId(hospitalId); R result = remoteUserService.info(userDTO, SecurityConstants.FROM_IN); UserDetails userDetails = getUserDetails(result); if (cache != null) { @@ -74,8 +73,4 @@ public class RaxUserDetailsServiceImpl implements RaxUserDetailsService { return Integer.MIN_VALUE; } - @Override - public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { - return null; - } } diff --git a/upms/upms-biz/src/main/java/com/rax/admin/controller/SysUserController.java b/upms/upms-biz/src/main/java/com/rax/admin/controller/SysUserController.java index b475f0c..1f95eac 100644 --- a/upms/upms-biz/src/main/java/com/rax/admin/controller/SysUserController.java +++ b/upms/upms-biz/src/main/java/com/rax/admin/controller/SysUserController.java @@ -61,12 +61,11 @@ public class SysUserController { */ @Inner @GetMapping(value = {"/info/query"}) - public R info(@RequestParam(required = false) String username, @RequestParam(required = false) String phone, @RequestParam(required = false) String hospitalId) { + public R info(@RequestParam(required = false) String username, @RequestParam(required = false) String phone) { SysUser user = userService.getOne(Wrappers.query() .lambda() .eq(StrUtil.isNotBlank(username), SysUser::getUsername, username) - .eq(StrUtil.isNotBlank(phone), SysUser::getPhone, phone) - .eq(StringUtils.hasText(hospitalId), SysUser::getHospitalId, hospitalId)); + .eq(StrUtil.isNotBlank(phone), SysUser::getPhone, phone)); SysUser user1 = userService.getOne(Wrappers.query() .lambda() .eq(StrUtil.isNotBlank(username), SysUser::getUsername, username) @@ -84,14 +83,14 @@ public class SysUserController { } } if (isAdmin) { - sysHospitalService.changeHospital(hospitalId, String.valueOf(user1.getUserId())); + sysHospitalService.changeHospital("", String.valueOf(user1.getUserId())); return R.ok(userService.findUserInfo(user1)); } else { return R.failed(MsgUtils.getMessage(ErrorCodes.SYS_USER_USERINFO_EMPTY, username)); } } } - sysHospitalService.changeHospital(hospitalId, String.valueOf(user.getUserId())); + sysHospitalService.changeHospital(String.valueOf(user.getHospitalId()), String.valueOf(user.getUserId())); return R.ok(userService.findUserInfo(user)); } diff --git a/upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysHospitalServiceImpl.java b/upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysHospitalServiceImpl.java index 910204a..2c69026 100644 --- a/upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysHospitalServiceImpl.java +++ b/upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysHospitalServiceImpl.java @@ -106,6 +106,9 @@ public class SysHospitalServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq("id", raxUser.getHospitalId()); @@ -133,11 +136,9 @@ public class SysHospitalServiceImpl extends ServiceImpl impl } // 判断输入的部门名称列表是否合法 - List postNameList = StrUtil.split(excel.getPostNameList(), StrUtil.COMMA); - List postCollList = postList.stream() - .filter(post -> postNameList.stream().anyMatch(name -> post.getPostName().equals(name))) - .collect(Collectors.toList()); - - if (postCollList.size() != postNameList.size()) { - errorMsg.add(MsgUtils.getMessage(ErrorCodes.SYS_POST_POSTNAME_INEXISTENCE, excel.getPostNameList())); - } +// List postNameList = StrUtil.split(excel.getPostNameList(), StrUtil.COMMA); +// List postCollList = postList.stream() +// .filter(post -> postNameList.stream().anyMatch(name -> post.getPostName().equals(name))) +// .collect(Collectors.toList()); +// +// if (postCollList.size() != postNameList.size()) { +// errorMsg.add(MsgUtils.getMessage(ErrorCodes.SYS_POST_POSTNAME_INEXISTENCE, excel.getPostNameList())); +// } // 数据合法情况 if (CollUtil.isEmpty(errorMsg)) { - insertExcelUser(excel, deptOptional, roleCollList, postCollList); + insertExcelUser(excel, deptOptional, roleCollList, null); } else { // 数据不合法情况 errorMessageList.add(new ErrorMessage(excel.getLineNum(), errorMsg)); @@ -381,8 +381,8 @@ public class SysUserServiceImpl extends ServiceImpl impl // 根据部门名称查询部门ID userDTO.setDeptId(deptOptional.get().getDeptId()); // 插入岗位名称 - List postIdList = postCollList.stream().map(SysPost::getPostId).collect(Collectors.toList()); - userDTO.setPost(postIdList); +// List postIdList = postCollList.stream().map(SysPost::getPostId).collect(Collectors.toList()); +// userDTO.setPost(postIdList); // 根据角色名称查询角色ID List roleIdList = roleCollList.stream().map(SysRole::getRoleId).collect(Collectors.toList()); userDTO.setRole(roleIdList); diff --git a/upms/upms-biz/src/main/resources/file/user.xlsx b/upms/upms-biz/src/main/resources/file/user.xlsx index ed5a606..4ac69c0 100644 Binary files a/upms/upms-biz/src/main/resources/file/user.xlsx and b/upms/upms-biz/src/main/resources/file/user.xlsx differ diff --git a/upms/upms-biz/src/main/resources/file/user_bak.xlsx b/upms/upms-biz/src/main/resources/file/user_bak.xlsx new file mode 100644 index 0000000..ed5a606 Binary files /dev/null and b/upms/upms-biz/src/main/resources/file/user_bak.xlsx differ