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/OrderController.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 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 184c8c7..d513a35 100644
--- a/src/main/java/com/zy/crm/manager/controller/OrderController.java
+++ b/src/main/java/com/zy/crm/manager/controller/OrderController.java
@@ -64,9 +64,19 @@
if (param.get("status") != null) {
status = Integer.parseInt(param.get("status").toString());
}
+
+ if (deptId==null && userId == null){
+ if (getRole().getId()==3){
+ userId = getUserId();
+ }else if (getRole().getId()==2){
+ deptId = getDeptId();
+ userId = null;
+ }
+ }
+
return R.ok(orderService.getPage(new Page<>(curr, limit)
, getHostId()
- , deptId == null ? (userId == null? getDeptId().toString(): null) : String.valueOf(deptId)
+ , deptId == null ? null : String.valueOf(deptId)
, userId
, condition
, status)
--
Gitblit v1.9.1