From 84a995c146ce6ab74709a503d010b03fb469e022 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 21 七月 2026 15:01:57 +0800
Subject: [PATCH] 代码提交
---
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 ++++++++----------
2 files changed, 14 insertions(+), 17 deletions(-)
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 20a5bff..c8939c6 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
@@ -519,21 +519,20 @@
log.info("sserviceFund淇濆瓨鐨勭殑鍊兼槸-------- :{}", aBoolean);
//鍔炲叕瀹ゅ鎵归�氳繃涔嬪悗锛屽氨闇�瑕佹妸鈥滃姙鍏涓讳换鈥濈殑鍚嶅瓧濉笂
- List<SysUser> sysUsers =null;
+ SysUser sysUsers =null;
if(StringUtils.isNotEmpty(user.getUserName())) {
- SysUser su = new SysUser();
- su.setUserName(user.getUserName());
- sysUsers = sysUserMapper.selectAllocatedList(su);
+ sysUsers = sysUserMapper.selectUserByUserName(user.getUserName());
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()))) {
+ if (checkFundVO.getFlowconclusion() == 1 && sysUsers != null
+ && sysUsers.getRoles() != null
+ && sysUsers.getRoles().stream().anyMatch(role -> "officedirector".equals(role.getRoleKey()))) {
serviceFund.setOfficedirector(user.getNickName());
serviceFund.setUploadStates(1);
//鏁版嵁鍙戦��
Boolean aBoolean1 = null;
if (newSwitch == 1) {
+ log.info("璐圭敤newSwitch杩斿洖鐨勫�间负:{}", newSwitch);
//鎼炰竴涓紑鍏筹紝鍒奖鍝嶈�佹祦绋�
aBoolean1 = sendData(serviceFund);
if (!aBoolean1) {
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 a41fe58..ff4b821 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
@@ -447,7 +447,8 @@
map.put("瀹℃壒浜猴細", loginUser.getUser().getUserName());
map.put("瀹℃壒鏃堕棿锛�", new Date());
map.put("鎰忚锛�", "涓嶉�氳繃");
- if (StringUtils.isNotBlank(checkFundVO.getFlowcontent())) map.put("鎰忚锛�", checkFundVO.getFlowcontent());
+ if (StringUtils.isNotBlank(checkFundVO.getFlowcontent()))
+ map.put("鎰忚锛�", checkFundVO.getFlowcontent());
contentList.add(map);
DingTalkReqVo dingTalkReqVo = new DingTalkReqVo();
dingTalkReqVo.setTitle("璐㈠姟绯荤粺椹冲洖淇℃伅");
@@ -494,22 +495,19 @@
}
//鍔炲叕瀹や富浠诲鎵归�氳繃涔嬪悗锛屽氨闇�瑕佹妸鈥滃姙鍏涓讳换鈥濈殑鍚嶅瓧濉笂
- 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);
+ SysUser sysUser = null;
+ if (StringUtils.isNotEmpty(user.getUserName())) {
+ sysUser = sysUserMapper.selectUserByUserName(user.getUserName());
+ log.info("宸梾sysUsers杩斿洖鐨勫�间负:{}", sysUser);
}
- if (checkFundVO.getFlowconclusion() == 1 && !sysUsers.isEmpty()
- && sysUsers.get(0).getRoles() != null
- && sysUsers.get(0).getRoles().stream().anyMatch(role -> "officedirector".equals(role.getRoleKey()))){
+ if (checkFundVO.getFlowconclusion() == 1 && Objects.nonNull(sysUser) && sysUser.getRoles() != null && sysUser.getRoles().stream().anyMatch(role -> "officedirector".equals(role.getRoleKey()))) {
serviceReimbursement.setOfficedirector(user.getNickName());
serviceReimbursement.setUploadStates(1);
Boolean aBoolean1 = null;
if (newSwitch == 1) {
+ log.info("宸梾newSwitch杩斿洖鐨勫�间负:{}", newSwitch);
aBoolean1 = sendData(serviceReimbursement);
if (!aBoolean1) {
allMap.put("500", "鍙戦�佸け璐�");
--
Gitblit v1.9.3