#

Junjie

2023-09-08 133307a0637193ca0c23f468aea2bd91c76e710a

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

@@ -52,12 +52,18 @@
                  @RequestParam(defaultValue = "10") Integer limit,
                  @RequestParam(required = false) String condition,
                  @RequestParam(required = false, value = "dept_id") Long deptId,
                  @RequestParam(required = false, value = "user_id") Long userId){
                  @RequestParam(required = false, value = "user_id") Long userId,
                  @RequestParam Map<String, Object> param){
        Integer status = null;
        if (param.get("status") != null) {
            status = Integer.parseInt(param.get("status").toString());
        }
        return R.ok(orderService.getPage(new Page<>(curr, limit)
                , getHostId()
                , deptId == null ? null : String.valueOf(deptId)
                , userId == null ? getUserId() : userId
                , condition)
                , condition
                , status)
        );
    }

@@ -165,7 +171,8 @@
                , getHostId()
                , role.judgeLeader() ? String.valueOf(user.getDeptId()) : null
                , user.getId()
                , condition);
                , condition
                , null);
        List<KeyValueVo> vos = new ArrayList<>();
        page.getRecords().forEach(item -> vos.add(new KeyValueVo(item.getName(), item.getId())));
        return R.ok().add(vos);