diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/UserAuthMappingService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/UserAuthMappingService.java index 36d92203e..5319b8b83 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/UserAuthMappingService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/UserAuthMappingService.java @@ -121,5 +121,5 @@ public interface UserAuthMappingService { * @param request * @return */ - List findUserListByRole(SysRoleRequest request); + List findUserListByRole(SysRoleRequest request,Boolean flag); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java index eb3bebe31..63773d4a4 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java @@ -877,7 +877,7 @@ public class ShopServiceImpl implements ShopService { private List getUsersByRole(UserRoleEnum role) { SysRoleRequest request = new SysRoleRequest(); request.setRoleName(role.getDesc()); - return convertToUserDTOs(userAuthMappingService.findUserListByRole(request)); + return convertToUserDTOs(userAuthMappingService.findUserListByRole(request,false)); } private List getUsersByRoleAndRegion(UserRoleEnum role, Long regionId) { diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/UserAuthMappingServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/UserAuthMappingServiceImpl.java index 18a1a656d..00cfd10eb 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/UserAuthMappingServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/UserAuthMappingServiceImpl.java @@ -484,7 +484,7 @@ public class UserAuthMappingServiceImpl implements UserAuthMappingService { } @Override - public List findUserListByRole(SysRoleRequest request) { + public List findUserListByRole(SysRoleRequest request,Boolean flag) { UserRoleEnum userRoleEnum = UserRoleEnum.getByDesc(request.getRoleName()); List hasRoleUserIdList = enterpriseUserRoleDao.selectUserIdsByRoleIdList(Collections.singletonList(userRoleEnum.getCode())); if (CollectionUtils.isEmpty(hasRoleUserIdList)) { @@ -496,7 +496,7 @@ public class UserAuthMappingServiceImpl implements UserAuthMappingService { return new ArrayList<>(); } // 报价员只能看到自己 - if (UserRoleEnum.QUOTATION_OFFICE.getDesc().equals(request.getRoleName())) { + if (UserRoleEnum.QUOTATION_OFFICE.getDesc().equals(request.getRoleName()) && flag) { LoginUserInfo userInfo = CurrentUserHolder.getUser(); return userDOList.stream().filter(row -> row.getUserId().equals(userInfo.getUserId())).collect(Collectors.toList()); } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/SysRoleController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/SysRoleController.java index 335714e77..94724e8eb 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/SysRoleController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/SysRoleController.java @@ -49,6 +49,6 @@ public class SysRoleController { @PostMapping(path = "/findUserListByRole") @ApiOperation("根据角色获取用户") public ResponseResult> findUserListByRole(@RequestBody SysRoleRequest request) { - return ResponseResult.success(userAuthMappingService.findUserListByRole(request)); + return ResponseResult.success(userAuthMappingService.findUserListByRole(request,true)); } }