diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/crmachievement/CrmAchievementServiceImpl.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/crmachievement/CrmAchievementServiceImpl.java index 8b42ab27..5959c452 100644 --- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/crmachievement/CrmAchievementServiceImpl.java +++ b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/crmachievement/CrmAchievementServiceImpl.java @@ -161,7 +161,9 @@ public class CrmAchievementServiceImpl implements CrmAchievementService { AdminUserPageApiDTO userPageReqVO = new AdminUserPageApiDTO(); userPageReqVO.setPageNo(pageReqVO.getPageNo()); userPageReqVO.setPageSize(pageReqVO.getPageSize()); - PageResult pageResult = adminUserApi.getUserPage(userPageReqVO).getCheckedData(); + // -- 这里固定查询销售的 + userPageReqVO.setRoleCode("sale"); + PageResult pageResult = adminUserApi.getUserBringDeptPage(userPageReqVO).getCheckedData(); PageResult pageResult1 = BeanUtils.toBean(pageResult, UserAchieveRespVO.class); List typeIds = new ArrayList<>(); for (UserAchieveRespVO vo : pageResult1.getList()) { diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApi.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApi.java index cd736455..f6ed58bb 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApi.java +++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApi.java @@ -116,4 +116,8 @@ public interface AdminUserApi { @GetMapping(PREFIX + "/getUserListBySubordinateIds") @Operation(summary = "获取当前部门以及下级部门所有人员(负责人)") CommonResult> getUserListBySubordinateIds(@RequestParam(name = "adminId") Long adminId); + + @PostMapping(PREFIX + "/getUserBringDeptPage") + @Operation(summary = "获取用户分页列表通过条件") + CommonResult> getUserBringDeptPage(@RequestBody AdminUserPageApiDTO userPageReqVO); } diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/user/dto/AdminUserPageApiDTO.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/user/dto/AdminUserPageApiDTO.java index 7d9c2842..f3296ca7 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/user/dto/AdminUserPageApiDTO.java +++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/user/dto/AdminUserPageApiDTO.java @@ -40,4 +40,7 @@ public class AdminUserPageApiDTO extends PageParam { @Schema(description = "考勤组ids", example = "1024") private List groupIds; + + @Schema(description = "角色code", example = "1") + private String roleCode; } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApiImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApiImpl.java index d83abd31..5c45149a 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApiImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApiImpl.java @@ -145,4 +145,13 @@ public class AdminUserApiImpl implements AdminUserApi { return success(ids); } + @Override + public CommonResult> getUserBringDeptPage(AdminUserPageApiDTO dto) { + PageResult vo = new PageResult<>(); + UserPageReqVO userPageReqVO = BeanUtil.copyProperties(dto, UserPageReqVO.class); + PageResult pageResult = userService.getUserBringDeptPage(userPageReqVO); + BeanUtil.copyProperties(pageResult, vo); + return success(vo); + } + } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserPageReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserPageReqVO.java index fb3a273e..8593ac03 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserPageReqVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserPageReqVO.java @@ -45,4 +45,7 @@ public class UserPageReqVO extends PageParam { @Schema(description = "考勤组ids", example = "1024") private List groupIds; + @Schema(description = "角色编码", example = "1024") + private String roleCode; + } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/user/AdminUserMapper.xml b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/user/AdminUserMapper.xml index 31ade189..331998ba 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/user/AdminUserMapper.xml +++ b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/user/AdminUserMapper.xml @@ -129,6 +129,10 @@ left join kq_attendance_group_user c on a.id = c.user_id + + left join system_user_role as d on a.id = d.user_id AND d.deleted = 0 + left join system_role as e on d.role_id = e.id AND e.deleted = 0 + a.deleted = 0 and a.user_type = 1 @@ -166,6 +170,9 @@ #{groupId} + + and e.code = #{vo.roleCode} + + +