From f6c36a54e184d82b4fdb86982292f22e927fb668 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 01 十一月 2023 15:58:22 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/CstmrController.java | 4 ++--
1 files changed, 2 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 0468066..f6c16ae 100644
--- a/src/main/java/com/zy/crm/manager/controller/CstmrController.java
+++ b/src/main/java/com/zy/crm/manager/controller/CstmrController.java
@@ -120,8 +120,8 @@
}
return R.ok(cstmrService.getPage3(new Page<>(curr, limit)
, getHostId()
- , deptId == null ? null : String.valueOf(deptId)
- , userId == null ? getUserId() : userId
+ , deptId == null ? (userId == null? getDeptId().toString(): null) : String.valueOf(deptId)
+ , userId
, Cools.isEmpty(followerName) ? null : ids
, conditionName
, condition)
--
Gitblit v1.9.1