From 2af026a8b4ff03fe32136d9c891568db64b30d6c Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 17 七月 2026 12:57:27 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/TimeVO.java | 2 ++
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java | 13 +++++++++++--
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java | 18 ++++++++++++++++--
3 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/TimeVO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/TimeVO.java
index 4eb5c19..8fd0bc4 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/TimeVO.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/TimeVO.java
@@ -22,5 +22,7 @@
//鍣ㄥ畼绉绘鐘舵�� 锛�0锛氭湭绉绘锛�1锛氬凡绉绘锛�2锛氬純鐢�
private Integer transplantstate = null;
+ private String donateHospital;
+
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java
index 28353ca..20a5bff 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java
@@ -518,8 +518,17 @@
Boolean aBoolean = serviceFundflowService.saveData(serviceFundflow);
log.info("sserviceFund淇濆瓨鐨勭殑鍊兼槸-------- :{}", aBoolean);
- //053瀹℃壒閫氳繃涔嬪悗锛屽氨闇�瑕佹妸鈥滃姙鍏涓讳换鈥濈殑鍚嶅瓧濉笂
- if (checkFundVO.getFlowconclusion() == 1 && user.getUserName().equals("053")) {
+ //鍔炲叕瀹ゅ鎵归�氳繃涔嬪悗锛屽氨闇�瑕佹妸鈥滃姙鍏涓讳换鈥濈殑鍚嶅瓧濉笂
+ List<SysUser> sysUsers =null;
+ if(StringUtils.isNotEmpty(user.getUserName())) {
+ SysUser su = new SysUser();
+ su.setUserName(user.getUserName());
+ sysUsers = sysUserMapper.selectAllocatedList(su);
+ log.info("璐圭敤sysUsers杩斿洖鐨勫�间负:{}", sysUsers);
+ }
+ if (checkFundVO.getFlowconclusion() == 1 && sysUsers != null && !sysUsers.isEmpty()
+ && sysUsers.get(0).getRoles() != null
+ && sysUsers.get(0).getRoles().stream().anyMatch(role -> "officedirector".equals(role.getRoleKey()))) {
serviceFund.setOfficedirector(user.getNickName());
serviceFund.setUploadStates(1);
//鏁版嵁鍙戦��
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java
index a053db7..a41fe58 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java
@@ -25,6 +25,7 @@
import com.ruoyi.project.domain.vo.SpFinancialExpensesReimbursementOut;
import com.ruoyi.project.mapper.*;
import com.ruoyi.project.service.*;
+import com.ruoyi.system.mapper.SysUserMapper;
import com.ruoyi.system.mapper.SysUserRoleMapper;
import com.ruoyi.system.service.ISysPostService;
import com.ruoyi.system.service.ISysUserService;
@@ -79,6 +80,9 @@
@Autowired
IServiceReimbursementpayeeService payeeService;
+
+ @Autowired
+ SysUserMapper sysUserMapper;
@Autowired
IServiceFundflowruleService serviceFundflowruleService;
@@ -489,8 +493,18 @@
}
}
- //053瀹℃壒閫氳繃涔嬪悗锛屽氨闇�瑕佹妸鈥滃姙鍏涓讳换鈥濈殑鍚嶅瓧濉笂
- if (checkFundVO.getFlowconclusion() == 1 && user.getUserName().equals("053")) {
+ //鍔炲叕瀹や富浠诲鎵归�氳繃涔嬪悗锛屽氨闇�瑕佹妸鈥滃姙鍏涓讳换鈥濈殑鍚嶅瓧濉笂
+ List<SysUser> sysUsers =null;
+ if(StringUtils.isNotEmpty(user.getUserName())) {
+ SysUser su = new SysUser();
+ su.setUserName(user.getUserName());
+ sysUsers = sysUserMapper.selectAllocatedList(su);
+ log.info("宸梾sysUsers杩斿洖鐨勫�间负:{}", sysUsers);
+ }
+
+ if (checkFundVO.getFlowconclusion() == 1 && !sysUsers.isEmpty()
+ && sysUsers.get(0).getRoles() != null
+ && sysUsers.get(0).getRoles().stream().anyMatch(role -> "officedirector".equals(role.getRoleKey()))){
serviceReimbursement.setOfficedirector(user.getNickName());
serviceReimbursement.setUploadStates(1);
--
Gitblit v1.9.3