From aa0161bf05195ccb00bc1d8da4b1b8218f93f4d3 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 04 十一月 2023 16:14:18 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/OrderController.java | 16 +++++++++++++++-
1 files changed, 15 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 184c8c7..5b2bebd 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,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<>();
--
Gitblit v1.9.1