yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/crmachievement/CrmAchievementServiceImpl.java

@@ -161,9 +161,7 @@ public class CrmAchievementServiceImpl implements CrmAchievementService {
         AdminUserPageApiDTO userPageReqVO = new AdminUserPageApiDTO();
         userPageReqVO.setPageNo(pageReqVO.getPageNo());
         userPageReqVO.setPageSize(pageReqVO.getPageSize());
-        // -- 这里固定查询销售的
-        userPageReqVO.setRoleCode("sale");
-        PageResult<AdminUserApiVO> pageResult = adminUserApi.getUserBringDeptPage(userPageReqVO).getCheckedData();
+        PageResult<AdminUserApiVO> pageResult = adminUserApi.getUserPage(userPageReqVO).getCheckedData();
         PageResult<UserAchieveRespVO> pageResult1 = BeanUtils.toBean(pageResult, UserAchieveRespVO.class);
         List<Long> typeIds = new ArrayList<>();
         for (UserAchieveRespVO vo : pageResult1.getList()) {

yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApi.java

@@ -116,8 +116,4 @@ public interface AdminUserApi {
     @GetMapping(PREFIX + "/getUserListBySubordinateIds")
     @Operation(summary = "获取当前部门以及下级部门所有人员(负责人)")
     CommonResult<List<Long>> getUserListBySubordinateIds(@RequestParam(name = "adminId") Long adminId);
-
-    @PostMapping(PREFIX + "/getUserBringDeptPage")
-    @Operation(summary = "获取用户分页列表通过条件")
-    CommonResult<PageResult<AdminUserApiVO>> getUserBringDeptPage(@RequestBody AdminUserPageApiDTO userPageReqVO);
 }

yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/user/dto/AdminUserPageApiDTO.java

@@ -40,7 +40,4 @@ public class AdminUserPageApiDTO extends PageParam {
 
     @Schema(description = "考勤组ids", example = "1024")
     private List<Long> groupIds;
-
-    @Schema(description = "角色code", example = "1")
-    private String roleCode;
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApiImpl.java

@@ -145,13 +145,4 @@ public class AdminUserApiImpl implements AdminUserApi {
         return success(ids);
     }
 
-    @Override
-    public CommonResult<PageResult<AdminUserApiVO>> getUserBringDeptPage(AdminUserPageApiDTO dto) {
-        PageResult<AdminUserApiVO> vo = new PageResult<>();
-        UserPageReqVO userPageReqVO = BeanUtil.copyProperties(dto, UserPageReqVO.class);
-        PageResult<AdminUserDO> pageResult = userService.getUserBringDeptPage(userPageReqVO);
-        BeanUtil.copyProperties(pageResult, vo);
-        return success(vo);
-    }
-
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserPageReqVO.java

@@ -45,7 +45,4 @@ public class UserPageReqVO extends PageParam {
     @Schema(description = "考勤组ids", example = "1024")
     private List<Long> groupIds;
 
-    @Schema(description = "角色编码", example = "1024")
-    private String roleCode;
-
 }

yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/user/AdminUserMapper.xml

@@ -129,10 +129,6 @@
         <if test="vo.groupIds != null and vo.groupIds.size() > 0">
             left join kq_attendance_group_user c on a.id = c.user_id
         </if>
-        <if test="vo.roleCode != null and vo.roleCode != ''">
-            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
-        </if>
         <where>
             a.deleted = 0
             and a.user_type = 1
@@ -170,9 +166,6 @@
                     #{groupId}
                 </foreach>
             </if>
-            <if test="vo.roleCode != null and vo.roleCode != ''">
-                and e.code = #{vo.roleCode}
-            </if>
         </where>
     </select>
     <select id="selectListByCondition"
@@ -208,6 +201,4 @@
             </if>
         </where>
     </select>
-
-
 </mapper>