From e9bd81174669058dfc5a0d3fb6282d22de7497d1 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 01 十一月 2023 15:44:35 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/OrderController.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 e599f10..184c8c7 100644
--- a/src/main/java/com/zy/crm/manager/controller/OrderController.java
+++ b/src/main/java/com/zy/crm/manager/controller/OrderController.java
@@ -66,8 +66,8 @@
}
return R.ok(orderService.getPage(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
, condition
, status)
);
--
Gitblit v1.9.1