From 565442c3bc65d7596b624a16fcd4facf12fd6abb Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 04 十一月 2023 11:14:11 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/entity/ProcessPermissions.java | 2 ++
src/main/java/com/zy/crm/manager/controller/PlanController.java | 5 +++++
src/main/webapp/views/processPermissions/processPermissions.html | 1 +
3 files changed, 8 insertions(+), 0 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 bcf9b16..5a40c57 100644
--- a/src/main/java/com/zy/crm/manager/controller/PlanController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PlanController.java
@@ -640,6 +640,11 @@
List<User> users = userService.selectList(new EntityWrapper<User>().eq("dept_id", planLeader.getDeptId()));
List<KeyValueVo> vos = new ArrayList<>();
users.forEach(item -> vos.add(new KeyValueVo(String.valueOf(item.getNickname()), item.getId())));
+ if (planType.getType().equals(2)){
+ ProcessPermissions processPermissions= processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 101).eq("process", "1-1"));//2锛氭牳浠锋祦绋�
+ User manager = userService.selectById(processPermissions.getUserId()); // 鑾峰彇鏍镐环娴佺▼鑺傜偣1纭浜�
+ vos.add(new KeyValueVo(String.valueOf(manager.getNickname()), manager.getId()));
+ }
return R.ok().add(vos);
}
diff --git a/src/main/java/com/zy/crm/manager/entity/ProcessPermissions.java b/src/main/java/com/zy/crm/manager/entity/ProcessPermissions.java
index 345d167..0ee9b17 100644
--- a/src/main/java/com/zy/crm/manager/entity/ProcessPermissions.java
+++ b/src/main/java/com/zy/crm/manager/entity/ProcessPermissions.java
@@ -137,6 +137,8 @@
return "鏍镐环娴佺▼";
case 7:
return "鍚堝悓绠＄悊";
+ case 101:
+ return "鍏跺畠瑙勫垝鍛�";
default:
return String.valueOf(this.processMemo);
}
diff --git a/src/main/webapp/views/processPermissions/processPermissions.html b/src/main/webapp/views/processPermissions/processPermissions.html
index 0d776cd..97b7349 100644
--- a/src/main/webapp/views/processPermissions/processPermissions.html
+++ b/src/main/webapp/views/processPermissions/processPermissions.html
@@ -46,6 +46,7 @@
<!-- <option value="4">鍑哄樊娴佺▼</option>-->
<option value="5">鏍镐环娴佺▼</option>
<option value="7">鍚堝悓绠＄悊</option>
+ <option value="101">鍏跺畠瑙勫垝鍛�</option>
</select>
</div>
</div>
--
Gitblit v1.9.1