From bd5ab921857b0871f7b7f5b96408dae7239c13a0 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 02 十一月 2023 13:25:14 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/CstmrController.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/CstmrController.java b/src/main/java/com/zy/crm/manager/controller/CstmrController.java
index 2b89d7a..4e9fb14 100644
--- a/src/main/java/com/zy/crm/manager/controller/CstmrController.java
+++ b/src/main/java/com/zy/crm/manager/controller/CstmrController.java
@@ -119,6 +119,7 @@
}
}
+ Long director = null;
if (deptId==null && userId == null){
if (getRole().getId()==3){
userId = getUserId();
@@ -126,12 +127,14 @@
deptId = getDeptId();
userId = null;
}
+ director = getUserId();
}
return R.ok(cstmrService.getPage3(new Page<>(curr, limit)
, getHostId()
, deptId == null ? null : String.valueOf(deptId)
, userId
+ , director
, Cools.isEmpty(followerName) ? null : ids
, conditionName
, condition)
@@ -172,6 +175,7 @@
}
}
+ Long director = null;
if (deptId==null && userId == null){
if (getRole().getId()==3){
userId = getUserId();
@@ -179,12 +183,14 @@
deptId = getDeptId();
userId = null;
}
+ director = getUserId();
}
return R.ok(cstmrService.getPage33(new Page<>(curr, limit)
, getHostId()
, deptId == null ? null : String.valueOf(deptId)
, userId
+ , director
, Cools.isEmpty(followerName) ? null : ids
, conditionName
, condition)
--
Gitblit v1.9.1