#

LSH

2023-11-04 aa0161bf05195ccb00bc1d8da4b1b8218f93f4d3

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

@@ -64,10 +64,23 @@
        if (param.get("status") != null) {
            status = Integer.parseInt(param.get("status").toString());
        }

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