From afa3bc1e2f39f66f59ee9b15d6af16593acdc9a4 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 02 十二月 2023 10:38:27 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 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 60b6511..4d4221e 100644
--- a/src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java
+++ b/src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java
@@ -141,7 +141,7 @@
}
if (!signUserId && !signDeptId){
if (getRole().getId()==1){
- wrapper.or().eq("host_id",1);
+ wrapper.or().eq("host_id",getHostId());
}else if (getRole().getId()==2){
wrapper.eq("dept_id",getDeptId());
}else {
@@ -149,7 +149,7 @@
}
}
if (signHostId){
- wrapper.or().eq("host_id",1);
+ wrapper.or().eq("host_id",getHostId());
}
}
@RequestMapping(value = "/reimburseOnline/from/add/auth")
@@ -218,19 +218,19 @@
@Transactional
public R formModify(@RequestBody ReimburseOnlineDomainParam param){
- long planId = 0;
- if (!param.getTemplateName().equals("闈為」鐩瀷鎶ラ攢")){
- if (Cools.isEmpty(param.getOrderNo())){
- return R.error("淇敼澶辫触锛�"+param.getTemplateName()+"闇�瑕佸叧鑱旈」鐩彿");
- }
- String[] split = param.getOrderNo().split("---");
- planId = Long.parseLong(split[1]);
- }
+// long planId = 0;
+// if (!param.getTemplateName().equals("闈為」鐩瀷鎶ラ攢")){
+// if (Cools.isEmpty(param.getOrderNo())){
+// return R.error("淇敼澶辫触锛�"+param.getTemplateName()+"闇�瑕佸叧鑱旈」鐩彿");
+// }
+// String[] split = param.getOrderNo().split("---");
+// planId = Long.parseLong(split[1]);
+// }
Date now = new Date();
ReimburseOnline reimburseOnline = reimburseOnlineService.selectById(param.getReimburseId());
- if (!reimburseOnline.getSettle().equals(0)){
- return R.error("淇敼澶辫触锛佹彁浜や箣鍚庣姝慨鏀癸紒");
+ if (!reimburseOnline.getSettle().equals(1)){
+ return R.error("淇敼澶辫触锛侀儴闂ㄧ粡鐞嗗鏍镐箣鍚庣姝慨鏀癸紒");
}
if (!reimburseOnline.getUserId().equals(getUserId())){
return R.error("闈炲垱寤轰汉鍛樼姝慨鏀癸紒");
@@ -239,7 +239,7 @@
reimburseOnline.setCheckData(param.getCheckData());
reimburseOnline.setTemplateName(param.getTemplateName());
- reimburseOnline.setItemId(planId);
+// reimburseOnline.setItemId(planId);
reimburseOnline.setName(param.getName());
reimburseOnline.setUpdateTime(new Date());
--
Gitblit v1.9.1