From 978a3733aedaaa505867b64edfbe1f6caedbc798 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 04 十一月 2023 09:56:23 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/PlanController.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 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 a7062dd..bcf9b16 100644
--- a/src/main/java/com/zy/crm/manager/controller/PlanController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PlanController.java
@@ -698,21 +698,26 @@
ProcessPermissions processPermissions2 = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 5).eq("process", "1-2"));//2锛氭牳浠锋祦绋�
User manager2 = userService.selectById(processPermissions2.getUserId()); // 鑾峰彇鏍镐环娴佺▼鑺傜偣1纭浜�
+ ProcessPermissions processPermissions3= processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 5).eq("process", "1-3"));//2锛氭牳浠锋祦绋�
+ User manager3 = userService.selectById(processPermissions3.getUserId()); // 鑾峰彇鏍镐环娴佺▼鑺傜偣1纭浜�
int type =0;
if (getUserId().equals(manager1.getId())){
type=1;//(璐ф灦)
- }else if (getUserId().equals(manager2.getId())){
+ }else if (getUserId().equals(manager2.getId()) || getUserId().equals(manager3.getId())){
type = 2;//(闆嗘垚)
}else {
return R.error("浣犱笉鏄牳浠峰憳,鏃犳潈鎺ヤ换鍔�");
}
- List<Long> typeList = new ArrayList<>();
+ List<Long> typeList = new ArrayList<>();
List<PlanType> planTypes = planTypeService.selectList(new EntityWrapper<PlanType>().eq("type", type));
if (type==1){
planTypes = planTypeService.selectList(new EntityWrapper<PlanType>());
}
+ if (Cools.isEmpty(planTypes) || planTypes.size()==0){
+ return R.ok();
+ }
for (PlanType planType : planTypes){
typeList.add(planType.getId());
}
--
Gitblit v1.9.1