From 2a08b97f0aad3af5d981a722efb218fb201f821f Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 10 十一月 2023 11:23:34 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java b/src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java
index 37ed5f7..60b6511 100644
--- a/src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java
+++ b/src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java
@@ -74,7 +74,7 @@
}
// 姝ラ鏉＄浉鍏�
- resultObj.put("step", reimburseOnline.getSettle() == 6 ? 0 : reimburseOnline.getSettle() + 1);
+ resultObj.put("step", reimburseOnline.getSettle() == 7 ? 0 : reimburseOnline.getSettle() + 1);
return R.ok().add(resultObj);
}
@@ -140,7 +140,13 @@
}
}
if (!signUserId && !signDeptId){
- wrapper.eq("user_id", getUserId());
+ if (getRole().getId()==1){
+ wrapper.or().eq("host_id",1);
+ }else if (getRole().getId()==2){
+ wrapper.eq("dept_id",getDeptId());
+ }else {
+ wrapper.eq("user_id", getUserId());
+ }
}
if (signHostId){
wrapper.or().eq("host_id",1);
@@ -182,19 +188,19 @@
}
ProcessPermissions processPermissions3 = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 3).eq("process", param.getCheckData().equals("鍚�")? "3-1" : "3-2"));//3锛氭姤閿�娴佺▼
- User president3 = userService.selectById(processPermissions3.getUserId()); // 鑾峰彇鎶ヤ环娴佺▼鑺傜偣3纭浜�
+ User president3 = userService.selectById(processPermissions3.getUserId()); // 鑾峰彇娴佺▼鑺傜偣3纭浜�
ProcessPermissions processPermissions4 = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 3).eq("process", "4-1"));//3锛氭姤閿�娴佺▼
- User president4 = userService.selectById(processPermissions4.getUserId()); // 鑾峰彇鎶ヤ环娴佺▼鑺傜偣4纭浜�
+ User president4 = userService.selectById(processPermissions4.getUserId()); // 鑾峰彇娴佺▼鑺傜偣4纭浜�
ProcessPermissions processPermissions5 = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 3).eq("process", "5-1"));//3锛氭姤閿�娴佺▼
- User president5 = userService.selectById(processPermissions5.getUserId()); // 鑾峰彇鎶ヤ环娴佺▼鑺傜偣5纭浜�
+ User president5 = userService.selectById(processPermissions5.getUserId()); // 鑾峰彇娴佺▼鑺傜偣5纭浜�
ProcessPermissions processPermissions6 = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 3).eq("process", "6-1"));//3锛氭姤閿�娴佺▼
- User president6 = userService.selectById(processPermissions6.getUserId()); // 鑾峰彇鎶ヤ环娴佺▼鑺傜偣6纭浜�
+ User president6 = userService.selectById(processPermissions6.getUserId()); // 鑾峰彇娴佺▼鑺傜偣6纭浜�
reimburseOnline.setSettleMsg(JSON.toJSONString(SettleDto.initPriQuote(reimburseOnline, manager,president3,president4,president5,president6,getUser())));
- reimburseOnline.setMemberId(getUser().getId());
+ reimburseOnline.setMemberId(manager.getId());
if (!reimburseOnlineService.insert(reimburseOnline)){
return R.error("娣诲姞鎶ラ攢涓绘。澶辫触");
--
Gitblit v1.9.1