#

LSH

2023-11-02 bd5ab921857b0871f7b7f5b96408dae7239c13a0

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

@@ -119,6 +119,7 @@
            }
        }

        Long director = null;
        if (deptId==null && userId == null){
            if (getRole().getId()==3){
                userId = getUserId();
@@ -126,12 +127,14 @@
                deptId = getDeptId();
                userId = null;
            }
            director = getUserId();
        }

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

            }
        }
        Long director = null;
        if (deptId==null && userId == null){
            if (getRole().getId()==3){
                userId = getUserId();
@@ -179,12 +183,14 @@
                deptId = getDeptId();
                userId = null;
            }
            director = getUserId();
        }

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