From 197dd8160fb3c1270e2d11b14eabd8e55c35ef70 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 10 十月 2023 17:02:18 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/PlanController.java | 22 +++++++++--
src/main/java/com/zy/crm/manager/controller/ProcessPermissionsController.java | 20 ++++++++++
src/main/webapp/views/processPermissions/processPermissions.html | 27 +++++++++++++
3 files changed, 65 insertions(+), 4 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 ac48cfe..f90a914 100644
--- a/src/main/java/com/zy/crm/manager/controller/PlanController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PlanController.java
@@ -55,6 +55,8 @@
private OrderService orderService;
@Autowired
private SmsCodeService smsCodeService;
+ @Autowired
+ private ProcessPermissionsService processPermissionsService;
String PZH=" 鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�� ";
@@ -677,12 +679,24 @@
wrapper.like("name", condition);
wrapper.eq("status",1);
- int type =1;
- if (getUser().getNickname().equals("鏉庝笘璞�2绾�")){
- type=2;
+
+ ProcessPermissions processPermissions1 = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 5).eq("process", "1-1"));//2锛氭牳浠锋祦绋�
+ User manager1 = userService.selectById(processPermissions1.getUserId()); // 鑾峰彇鏍镐环娴佺▼鑺傜偣1纭浜�
+
+ ProcessPermissions processPermissions2 = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 5).eq("process", "1-2"));//2锛氭牳浠锋祦绋�
+ User manager2 = userService.selectById(processPermissions2.getUserId()); // 鑾峰彇鏍镐环娴佺▼鑺傜偣1纭浜�
+
+
+ int type =0;
+ if (getUserId().equals(manager1.getId())){
+ type=1;//(璐ф灦)
+ }else if (getUserId().equals(manager2.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));
for (PlanType planType : planTypes){
typeList.add(planType.getId());
diff --git a/src/main/java/com/zy/crm/manager/controller/ProcessPermissionsController.java b/src/main/java/com/zy/crm/manager/controller/ProcessPermissionsController.java
index 321ec3f..15b57ff 100644
--- a/src/main/java/com/zy/crm/manager/controller/ProcessPermissionsController.java
+++ b/src/main/java/com/zy/crm/manager/controller/ProcessPermissionsController.java
@@ -129,6 +129,26 @@
return R.ok(result);
}
+// @RequestMapping(value = "/processPermissionsProcessMemoQuery/auth")
+// @ManagerAuth
+// public R queryProcessMemo(String condition) {
+// List<ProcessPermissions> processPermissionsList = processPermissionsService.selectList(new EntityWrapper<>());
+// List<Map<String, Object>> result = new ArrayList<>();
+// List<Integer> processMemoInt = new ArrayList<>();
+// for (ProcessPermissions processPermissions : processPermissionsList){
+// if (!processMemoInt.contains(processPermissions.getProcessMemo())){
+// processMemoInt.add(processPermissions.getProcessMemo());
+// }else {
+// continue;
+// }
+// Map<String, Object> map = new HashMap<>();
+// map.put("id", processPermissions.getProcessMemo());
+// map.put("value", processPermissions.getProcessMemo$());
+// result.add(map);
+// }
+// return R.ok(result);
+// }
+
@RequestMapping(value = "/processPermissions/check/column/auth")
@ManagerAuth
public R query(@RequestBody JSONObject param) {
diff --git a/src/main/webapp/views/processPermissions/processPermissions.html b/src/main/webapp/views/processPermissions/processPermissions.html
index 04f8c98..1bc63b8 100644
--- a/src/main/webapp/views/processPermissions/processPermissions.html
+++ b/src/main/webapp/views/processPermissions/processPermissions.html
@@ -23,6 +23,18 @@
<input class="layui-input" type="text" name="user_name" placeholder="濮撳悕" autocomplete="off">
</div>
</div>
+<!-- <div class="layui-inline">-->
+<!-- <label class="layui-form-label">鏉冮檺绫诲瀷: </label>-->
+<!-- <div class="layui-input-inline cool-auto-complete">-->
+<!-- <input id="process_memo" class="layui-input" name="process_memo" type="text" placeholder="璇烽�夋嫨鏉冮檺绫诲瀷" autocomplete="off" style="display: none" >-->
+<!-- <input id="processMemo1$" name="process_memo" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="鏉冮檺绫诲瀷" onfocus=this.blur()>-->
+<!-- <div class="cool-auto-complete-window">-->
+<!-- <input class="cool-auto-complete-window-input" data-key="processPermissionsProcessMemoQueryBywrkSts" onkeyup="autoLoad(this.getAttribute('data-key'))">-->
+<!-- <select class="cool-auto-complete-window-select" data-key="processPermissionsProcessMemoQueryBywrkStsSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">-->
+<!-- </select>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
<div class="layui-inline">
<label class="layui-form-label">鏉冮檺绫诲瀷: </label>
<div class="layui-input-block">
@@ -43,6 +55,7 @@
<select name="process">
<option value="">璇烽�夋嫨鐘舵��</option>
<option value="1-1">1-1</option>
+ <option value="1-2">1-2</option>
<option value="2-1">2-1</option>
<option value="2-2">2-2</option>
<option value="3-1">3-1</option>
@@ -160,6 +173,18 @@
<!-- <input class="layui-input" name="standby6" placeholder="璇疯緭鍏ュ鐢ㄥ瓧娈�6">-->
<!-- </div>-->
<!-- </div>-->
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">鏉冮檺绫诲瀷: </label>-->
+<!-- <div class="layui-input-inline cool-auto-complete">-->
+<!-- <input class="layui-input" name="processMemo" type="text" placeholder="璇烽�夋嫨鏉冮檺绫诲瀷" autocomplete="off" style="display: none" lay-verify="required">-->
+<!-- <input name="processMemo" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="鏉冮檺绫诲瀷" onfocus=this.blur()>-->
+<!-- <div class="cool-auto-complete-window">-->
+<!-- <input class="cool-auto-complete-window-input" data-key="processPermissionsProcessMemoQueryBywrkSts" onkeyup="autoLoad(this.getAttribute('data-key'))">-->
+<!-- <select class="cool-auto-complete-window-select" data-key="processPermissionsProcessMemoQueryBywrkStsSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">-->
+<!-- </select>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
<div class="layui-form-item">
<label class="layui-form-label layui-form-required">鏉冮檺绫诲瀷: </label>
<div class="layui-input-block">
@@ -169,6 +194,7 @@
<option value="2">鎶ヤ环娴佺▼</option>
<option value="3">鎶ラ攢娴佺▼</option>
<option value="4">鍑哄樊娴佺▼</option>
+ <option value="5">鏍镐环娴佺▼</option>
<option value="7">鍚堝悓绠＄悊</option>
</select>
</div>
@@ -179,6 +205,7 @@
<select name="process" lay-vertype="tips" lay-verify="required">
<option value="">璇烽�夋嫨鐘舵��</option>
<option value="1-1">1-1</option>
+ <option value="1-2">1-2</option>
<option value="2-1">2-1</option>
<option value="3-1">3-1</option>
<option value="3-2">3-2</option>
--
Gitblit v1.9.1