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/PlanController.java |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/crm/manager/controller/PlanController.java b/src/main/java/com/zy/crm/manager/controller/PlanController.java
index 9a10e54..08a2175 100644
--- a/src/main/java/com/zy/crm/manager/controller/PlanController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PlanController.java
@@ -89,10 +89,22 @@
                   @RequestParam(required = false) String condition,
                   @RequestParam(required = false, value = "dept_id") Long deptId,
                   @RequestParam(required = false, value = "user_id") Long userId) {
+        Long director = null;
+        if (deptId==null && userId == null){
+            if (getRole().getId()==3){
+                userId = getUserId();
+            }else if (getRole().getId()==2){
+                deptId = getDeptId();
+                userId = null;
+            }
+            director = getUserId();
+        }
+
         return R.ok(planService.getPage(new Page<>(curr, limit)
                 , getHostId()
-                , deptId == null ? (userId == null? getDeptId().toString(): null) : String.valueOf(deptId)
+                , deptId == null ? null : String.valueOf(deptId)
                 , userId
+                , director
                 , condition)
         );
     }

--
Gitblit v1.9.1