From 336b1ee18a1d1ff4230e8edb7faa43e3b5ef1ffc Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 08 九月 2023 08:50:35 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/PriQuoteController.java | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/PriQuoteController.java b/src/main/java/com/zy/crm/manager/controller/PriQuoteController.java
index 45d3c06..b2409f2 100644
--- a/src/main/java/com/zy/crm/manager/controller/PriQuoteController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PriQuoteController.java
@@ -120,7 +120,7 @@
}
@RequestMapping(value = "/priQuote/add/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "娣诲姞鎶ヤ环鍗�")
public R add(@RequestBody Map<String,Object> map) {
PriQuoteBudget priQuoteBudget = priQuoteBudgetService.selectById(Long.parseLong(map.get("priQuoteBudgetId").toString()));
@@ -153,8 +153,8 @@
priQuote.setForm(JSON.toJSONString(map)); // 鑷畾涔夎〃鍗曞唴瀹�
priQuote.setSettle(1); // 1.寮�濮�
User manager = userService.getDeptManager(getHostId(), getUser().getDeptId()); // 鑾峰彇閮ㄩ棬棰嗗
- ProcessPermissions processPermissions = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 2).eq("process", 3));//2锛氭姤浠锋祦绋�
- User president = userService.selectById(processPermissions.getUserId()); // 鑾峰彇鎶ヤ环娴佺▼鑺傜偣3纭浜�
+ ProcessPermissions processPermissions = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 2).eq("process", "3-1"));//2锛氭姤浠锋祦绋�
+ User president = userService.selectById(processPermissions.getUserId()); // 鑾峰彇鎶ヤ环娴佺▼鑺傜偣3-1纭浜�
priQuote.setSettleMsg(JSON.toJSONString(SettleDto.initPriQuote(plan, manager,president,getUser())));
planService.updateById(plan);
@@ -164,7 +164,7 @@
}
@RequestMapping(value = "/priQuote/addOther/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鍙﹀瓨鎶ヤ环鍗�")
public R addOther(@RequestBody Map<String,Object> map) {
PriQuote quote = priQuoteService.selectById(Long.parseLong(map.get("id").toString()));
@@ -195,7 +195,7 @@
}
@RequestMapping(value = "/priQuote/update/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鏇存柊鎶ヤ环鍗�")
public R update(@RequestBody Map<String,Object> map){
PriQuote priQuote = priQuoteService.selectById(Long.parseLong(map.get("id").toString()));
priQuote.setTitle(map.get("title").toString());
@@ -209,7 +209,7 @@
}
@RequestMapping(value = "/priQuote/updateForm/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鏇存柊鎶ヤ环鍗�")
public R updateForm(Long id,String templateName,String title){
PriQuote priQuote = priQuoteService.selectById(id);
priQuote.setTemplateName(templateName);
@@ -223,7 +223,7 @@
}
@RequestMapping(value = "/priQuote/delete/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鍒犻櫎鎶ヤ环鍗�")
public R delete(Long[] ids){
if (Cools.isEmpty(ids)){
return R.error();
@@ -470,11 +470,10 @@
}
break;
case 2:
- // 鏌ユ壘瑙勫垝缁勯暱
- ProcessPermissions processPermissions = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 2).eq("process", 3));//2锛氭姤浠锋祦绋�
+ ProcessPermissions processPermissions = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 2).eq("process", "3-1"));//2锛氭姤浠锋祦绋�
User planLeader = userService.selectById(processPermissions.getUserId()); // 鑾峰彇鎶ヤ环娴佺▼鑺傜偣3纭浜�
if (Cools.isEmpty(planLeader)) {
- throw new CoolException("鏈煡鎵惧埌鎶ヤ环娴佺▼鑺傜偣3纭浜猴紝璇疯仈绯诲湪瀹℃壒鏉冮檺娣诲姞纭浜猴紒");
+ throw new CoolException("鏈煡鎵惧埌鎶ヤ环娴佺▼鑺傜偣3-1纭浜猴紝璇疯仈绯诲湪瀹℃壒鏉冮檺娣诲姞纭浜猴紒");
}
if (!getUserId().equals(planLeader.getId())) {
return R.error("鎶辨瓑锛屾偍娌℃湁瀹℃牳鐨勬潈闄�");
@@ -590,10 +589,10 @@
// }
// break;
// case 2:
-// // 鏌ユ壘瑙勫垝缁勯暱
-// User planLeader = userService.selectOne(new EntityWrapper<User>().eq("username","鐜嬪紑鏉�"));
+// ProcessPermissions processPermissions = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 2).eq("process", "3-1"));//2锛氭姤浠锋祦绋�
+// User planLeader = userService.selectById(processPermissions.getUserId()); // 鑾峰彇鎶ヤ环娴佺▼鑺傜偣3纭浜�
// if (Cools.isEmpty(planLeader)) {
-// throw new CoolException("鏈煡鎵炬�昏鍔烇紝璇疯仈绯荤鐞嗗憳");
+// throw new CoolException("鏈煡鎵惧埌鎶ヤ环娴佺▼鑺傜偣3-1纭浜猴紝璇疯仈绯诲湪瀹℃壒鏉冮檺娣诲姞纭浜猴紒");
// }
// if (!getUserId().equals(planLeader.getId())) {
// return R.error("鎶辨瓑锛屾偍娌℃湁瀹℃牳鐨勬潈闄�");
--
Gitblit v1.9.1