#

LSH

2023-11-03 1b7cf9411e6dbf70d64dc2028fba1ee739f6966a

 src/main/java/com/zy/crm/manager/controller/CstmrController.java

@@ -118,10 +118,23 @@

            }
        }

        Long director = null;
        if (deptId==null && userId == null){
            if (getRole().getId()==3){
                userId = getUserId();
            }else if (getRole().getId()==2){
                deptId = getDeptId();
                userId = null;
            }
            director = getUserId();
        }

        return R.ok(cstmrService.getPage3(new Page<>(curr, limit)
                , getHostId()
                , deptId == null ? (userId == null? getDeptId().toString(): null) : String.valueOf(deptId)
                , deptId == null ? null : String.valueOf(deptId)
                , userId
                , director
                , Cools.isEmpty(followerName) ? null : ids
                , conditionName
                , condition)
@@ -162,10 +175,22 @@

            }
        }
        Long director = null;
        if (deptId==null && userId == null){
            if (getRole().getId()==3){
                userId = getUserId();
            }else if (getRole().getId()==2){
                deptId = getDeptId();
                userId = null;
            }
            director = getUserId();
        }

        return R.ok(cstmrService.getPage33(new Page<>(curr, limit)
                , getHostId()
                , deptId == null ? null : String.valueOf(deptId)
                , userId == null ? getUserId() : userId
                , userId
                , director
                , Cools.isEmpty(followerName) ? null : ids
                , conditionName
                , condition)