#

LSH

2023-11-03 5f7598b354fdab871ebaf767200078316562e0c9

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

@@ -65,6 +65,7 @@
            status = Integer.parseInt(param.get("status").toString());
        }

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

        return R.ok(orderService.getPage(new Page<>(curr, limit)
                , getHostId()
                , deptId == null ? null : String.valueOf(deptId)
                , userId
                , director
                , condition
                , status)
        );
@@ -364,6 +367,7 @@
                , getHostId()
                , role.judgeLeader() ? String.valueOf(user.getDeptId()) : null
                , user.getId()
                , null
                , condition
                , 0);
        List<KeyValueVo> vos = new ArrayList<>();