From 108cd2008535e1fc703032cbe5bbbd3145e90ddc Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 06 八月 2025 11:42:25 +0800
Subject: [PATCH] yys 修改记录器具bug
---
src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java | 29 +++--------------------------
1 files changed, 3 insertions(+), 26 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java b/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java
index 9ad4f1e..2c04224 100644
--- a/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java
+++ b/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java
@@ -49,7 +49,7 @@
private final DailyRedisCounter dailyRedisCounter;
private final SysDeptMapper sysDeptMapper;
- private final ApproveNodeServiceImpl approveNodeService;
+ private final IApproveNodeService approveNodeService;
private final SysUserMapper sysUserMapper;
private final ApproveProcessMapper approveProcessMapper;
@@ -147,29 +147,6 @@
private final ApproveNodeMapper approveNodeMapper;
- @Override
- public void updateApproveProcessStatus(ApproveNode approveNode,Integer status) {
- LambdaQueryWrapper<ApproveProcess> approveProcessLambdaQueryWrapper = new LambdaQueryWrapper<>();
- approveProcessLambdaQueryWrapper.eq(ApproveProcess::getApproveId, approveNode.getApproveProcessId())
- .eq(ApproveProcess::getApproveDelete, 0)
- .eq(ApproveProcess::getTenantId, SecurityUtils.getLoginUser().getTenantId())
- .last("limit 1");
- ApproveProcess approveProcess = approveProcessMapper.selectOne(approveProcessLambdaQueryWrapper);
- if(approveProcess == null) throw new RuntimeException("瀹℃壒涓嶅瓨鍦�");
- LambdaQueryWrapper<ApproveNode> approveNodeLambdaQueryWrapper = new LambdaQueryWrapper<>();
- approveNodeLambdaQueryWrapper.eq(ApproveNode::getApproveProcessId, approveNode.getApproveProcessId())
- .eq(ApproveNode::getApproveNodeOrder, approveNode.getApproveNodeOrder() + 1)
- .eq(ApproveNode::getDeleteFlag, 0)
- .eq(ApproveNode::getTenantId, SecurityUtils.getLoginUser().getTenantId())
- .last("limit 1");
- ApproveNode approveNode1 = approveNodeMapper.selectOne(approveNodeLambdaQueryWrapper);
- approveProcess.setApproveStatus(status);
- if(approveNode1 != null){
- approveProcess.setApproveUserCurrentId(approveNode.getApproveNodeUserId());
- approveProcess.setApproveUserCurrentName(approveNode1.getApproveNodeUser());
- }
- updateById(approveProcess);
- }
@Override
public void updateByApproveId(ApproveGetAndUpdateVo approveGetAndUpdateVo) {
@@ -188,8 +165,8 @@
approve.setApproveUser(sysUser.getUserId());
//瀹℃牳涓笉鍙互缂栬緫瀹℃牳浜�
if(approve.getApproveStatus() != 1){
- approve.setApproveUserCurrentId(sysUsers.get(0).getUserId());
- approve.setApproveUserCurrentName(sysUsers.get(0).getNickName());
+ approve.setApproveUserCurrentId(Long.parseLong(split[0]));
+ approve.setApproveUserCurrentName(sysUsers.stream().filter(user -> user.getUserId().equals(Long.parseLong(split[0]))).collect(Collectors.toList()).get(0).getNickName());
}
updateById(approve);
//淇敼瀹℃壒浜�
--
Gitblit v1.9.3