From de8cae943c4cf3ff12bb4781fe122edbdf66b0c1 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 01 十一月 2023 18:08:06 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/CstmrController.java | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 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 f6c16ae..2b89d7a 100644
--- a/src/main/java/com/zy/crm/manager/controller/CstmrController.java
+++ b/src/main/java/com/zy/crm/manager/controller/CstmrController.java
@@ -118,9 +118,19 @@
}
}
+
+ if (deptId==null && userId == null){
+ if (getRole().getId()==3){
+ userId = getUserId();
+ }else if (getRole().getId()==2){
+ deptId = getDeptId();
+ userId = null;
+ }
+ }
+
return R.ok(cstmrService.getPage3(new Page<>(curr, limit)
, getHostId()
- , deptId == null ? (userId == null? getDeptId().toString(): null) : String.valueOf(deptId)
+ , deptId == null ? null : String.valueOf(deptId)
, userId
, Cools.isEmpty(followerName) ? null : ids
, conditionName
@@ -162,10 +172,19 @@
}
}
+ if (deptId==null && userId == null){
+ if (getRole().getId()==3){
+ userId = getUserId();
+ }else if (getRole().getId()==2){
+ deptId = getDeptId();
+ userId = null;
+ }
+ }
+
return R.ok(cstmrService.getPage33(new Page<>(curr, limit)
, getHostId()
, deptId == null ? null : String.valueOf(deptId)
- , userId == null ? getUserId() : userId
+ , userId
, Cools.isEmpty(followerName) ? null : ids
, conditionName
, condition)
--
Gitblit v1.9.1