From 108e2fc9543ce11e7069c4b4fc10d2f05006333b Mon Sep 17 00:00:00 2001 From: LSH Date: 星期四, 02 十一月 2023 12:47:13 +0800 Subject: [PATCH] # --- src/main/java/com/zy/crm/manager/controller/OrderController.java | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/crm/manager/controller/OrderController.java b/src/main/java/com/zy/crm/manager/controller/OrderController.java index e599f10..d513a35 100644 --- a/src/main/java/com/zy/crm/manager/controller/OrderController.java +++ b/src/main/java/com/zy/crm/manager/controller/OrderController.java @@ -64,10 +64,20 @@ if (param.get("status") != null) { status = Integer.parseInt(param.get("status").toString()); } + + if (deptId==null && userId == null){ + if (getRole().getId()==3){ + userId = getUserId(); + }else if (getRole().getId()==2){ + deptId = getDeptId(); + userId = null; + } + } + return R.ok(orderService.getPage(new Page<>(curr, limit) , getHostId() , deptId == null ? null : String.valueOf(deptId) - , userId == null ? getUserId() : userId + , userId , condition , status) ); -- Gitblit v1.9.1