From b3ca67f50de0dd141c29283533dd553aaec26154 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 02 十一月 2023 12:57:43 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/OrderController.java | 4 ++++
1 files changed, 4 insertions(+), 0 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 d513a35..5b2bebd 100644
--- a/src/main/java/com/zy/crm/manager/controller/OrderController.java
+++ b/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<>();
--
Gitblit v1.9.1