suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'cc_20250522_fix' into 'master'

Browse Source 
fix根据职位找人

See merge request hangzhou/java/custom_zxjp!93
This commit is contained in:
苏竹红
2025-05-22 11:14:07 +00:00
parent 9a5946ecf5 dea59e63bf
commit 1f3362bd71
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-service/src/main/java/com/cool/store/service/UserAuthMappingService.java
View File

@@ -121,5 +121,5 @@ public interface UserAuthMappingService {
* @param request
* @return
*/
List<EnterpriseUserDO> findUserListByRole(SysRoleRequest request);
List<EnterpriseUserDO> findUserListByRole(SysRoleRequest request,Boolean flag);
}

2
coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java
View File

@@ -877,7 +877,7 @@ public class ShopServiceImpl implements ShopService {
private List<UserDTO> getUsersByRole(UserRoleEnum role) {
SysRoleRequest request = new SysRoleRequest();
request.setRoleName(role.getDesc());
return convertToUserDTOs(userAuthMappingService.findUserListByRole(request));
return convertToUserDTOs(userAuthMappingService.findUserListByRole(request,false));
}
private List<UserDTO> getUsersByRoleAndRegion(UserRoleEnum role, Long regionId) {

4
coolstore-partner-service/src/main/java/com/cool/store/service/impl/UserAuthMappingServiceImpl.java
View File

@@ -484,7 +484,7 @@ public class UserAuthMappingServiceImpl implements UserAuthMappingService {
}
@Override
public List<EnterpriseUserDO> findUserListByRole(SysRoleRequest request) {
public List<EnterpriseUserDO> findUserListByRole(SysRoleRequest request,Boolean flag) {
UserRoleEnum userRoleEnum = UserRoleEnum.getByDesc(request.getRoleName());
List<String> 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());
}

2
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/SysRoleController.java
View File

@@ -49,6 +49,6 @@ public class SysRoleController {
@PostMapping(path = "/findUserListByRole")
@ApiOperation("根据角色获取用户")
public ResponseResult<List<EnterpriseUserDO>> findUserListByRole(@RequestBody SysRoleRequest request) {
return ResponseResult.success(userAuthMappingService.findUserListByRole(request));
return ResponseResult.success(userAuthMappingService.findUserListByRole(request,true));
}
}