列表

ZQN

2024-09-04 d7cbeb2ed120af3db849aecfd89ac9b9980a60f1

 project-admin/src/main/java/com/project/admin/controller/enforce/EnforceOrderController.java

@@ -49,14 +49,20 @@
    @ApiOperation("获取同行人")
    @GetMapping("/peerList")
    @Cacheable(value = "sysUser:peerList")
    public AjaxResult peerList(String nickName, String deptId)
    public AjaxResult peerList(String nickName, Long deptId)
    {
        String queryScope = " (dept_id = {} OR dept_id IN ( SELECT dept_id FROM sys_dept  WHERE find_in_set({}, ancestors) )) ";
        if (deptId==null){
            deptId = deptService.getCheckDeptIdByLoginDeptId(SecurityUtils.getDeptId());
        } else {
            deptId = deptService.getCheckDeptIdByLoginDeptId(deptId);
        }
        List<SysUser> list = userService.list(userService.lq()
                .ne(SysUser::getUserType,"02")
                .ne(SysUser::getUserName,"admin")
                .ne(SysUser::getUserId, SecurityUtils.getUserId())
                .like(StringUtils.isNotEmpty(nickName), SysUser::getNickName,nickName)
                .eq(deptId!=null, SysUser::getDeptId, deptId)
                .likeRight(StringUtils.isNotEmpty(nickName), SysUser::getNickName,nickName)
                .apply( StringUtils.format(queryScope, deptId, deptId))
        );
        list.forEach(user->{
            SysDept sysDept = deptService.selectDeptById(user.getDeptId());
@@ -70,6 +76,11 @@
    @GetMapping("/commonList")
    public TableDataInfo commonList(EnforceOrderQueryBo bo)
    {
        Long loginDeptId = SecurityUtils.getDeptId();
        if (bo.getCheckDeptId()==null && !loginDeptId.equals(100L) && loginDeptId.equals(101L))
        {
            bo.setCheckDeptId(deptService.getCheckDeptIdByLoginDeptId(loginDeptId));
        }
        startPage();
        List<EnforceOrderVo> list = iEnforceOrderService.queryCommonList(bo);
        return getDataTable(list);