From e4f82a68cdc10967abf0b69d9846721fdca2b77a Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 24 八月 2023 08:15:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zycrm' into zycrm
---
src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java | 5 +----
1 files changed, 1 insertions(+), 4 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 e8f4b5c..336ced3 100644
--- a/src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java
+++ b/src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java
@@ -559,14 +559,10 @@
for (SettleDto dto : list) {
if (dto.getStep().equals(settle)){
dto.setCurr(Boolean.FALSE);
- break;
}else if (dto.getStep().equals(settle+1)){
dto.setCurr(Boolean.TRUE);
dto.setMsg("鎶ヤ环娴佺▼鑺傜偣"+process+"纭浜�:"+planLeader.getNickname() + "瀹℃壒閫氳繃");
dto.setTime(DateUtils.convert(now));
- break;
- }else {
- break;
}
}
reimburseOnline.setSettleMsg(JSON.toJSONString(list));
@@ -579,6 +575,7 @@
settle=settle+2;
}else {
settle++;
+ reimburseOnline.setStatus(1);
}
ProcessPermissions processPermissions2 = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 3).eq("process", settle+"-"+split[1]));//3锛氭姤閿�娴佺▼
reimburseOnline.setMemberId(processPermissions2.getUserId());
--
Gitblit v1.9.1