From 13a735f1870f01f7d8f13db3de2d0359d928fde0 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期三, 14 十月 2026 15:34:42 +0800
Subject: [PATCH] 钉钉通知调整

---
 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java |   38 ++++++++++++++++++--------------------
 1 files changed, 18 insertions(+), 20 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 65c99ff..17d1ed3 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
@@ -559,27 +559,25 @@
                     FlowLevel = 0;
                 }
             }
-
-            SysUser sysUser = sysUserService.selectUserByUserName(serviceFund.getUserno());
-            //瀹℃壒鏈�氳繃锛氬崟鎹俊鎭� + 瀹℃壒浜�/瀹℃壒鏃堕棿/鎰忚锛堟剰瑙� = "瀹℃壒鏈�氳繃銆�" + 椹冲洖鎰忚锛�
-            List<ConcurrentHashMap<String, Object>> contentList = FundNotifyMessageBuilder.newRows();
-            FundNotifyMessageBuilder.addBillInfo(contentList, serviceFund.getApplytype(),
-                    serviceFund.getUsername(), serviceFund.getPretaxcost(), serviceFund.getDonorname(),
-                    FundNotifyMessageBuilder.billNo(serviceFund.getBh(), serviceFund.getId()));
-            FundNotifyMessageBuilder.addAuditResult(contentList, loginUser.getUser().getNickName(), new Date(),
-                    FundNotifyMessageBuilder.opinion(FundNotifyMessageBuilder.CONCLUSION_REJECT,
-                            checkFundVO.getFlowcontent()));
-            try {
-                DingTalkReqVo dingTalkReqVo = new DingTalkReqVo();
-                dingTalkReqVo.setTitle(FundNotifyMessageBuilder.TITLE);
-                dingTalkReqVo.setNumber(sysUser.getPhonenumber());
-                dingTalkReqVo.setContents(contentList);
-                dingTalkService.sendNotification(dingTalkReqVo);
-            } catch (Exception e) {
-                log.error("璐圭敤---瀹℃壒鏈�氳繃閽夐拤閫氱煡澶辫触锛宖undId={}", serviceFund.getId(), e);
-            }
         }
-
+        SysUser sysUser = sysUserService.selectUserByUserName(serviceFund.getUserno());
+        //瀹℃壒鏈�氳繃锛氬崟鎹俊鎭� + 瀹℃壒浜�/瀹℃壒鏃堕棿/鎰忚锛堟剰瑙� = "瀹℃壒鏈�氳繃銆�" + 椹冲洖鎰忚锛�
+        List<ConcurrentHashMap<String, Object>> contentList = FundNotifyMessageBuilder.newRows();
+        FundNotifyMessageBuilder.addBillInfo(contentList, serviceFund.getApplytype(),
+                serviceFund.getUsername(), serviceFund.getPretaxcost(), serviceFund.getDonorname(),
+                FundNotifyMessageBuilder.billNo(serviceFund.getBh(), serviceFund.getId()));
+        FundNotifyMessageBuilder.addAuditResult(contentList, loginUser.getUser().getNickName(), new Date(),
+                FundNotifyMessageBuilder.opinion(checkFundVO.getFlowconclusion()+"",
+                        checkFundVO.getFlowcontent()));
+        try {
+            DingTalkReqVo dingTalkReqVo = new DingTalkReqVo();
+            dingTalkReqVo.setTitle(FundNotifyMessageBuilder.TITLE);
+            dingTalkReqVo.setNumber(sysUser.getPhonenumber());
+            dingTalkReqVo.setContents(contentList);
+            dingTalkService.sendNotification(dingTalkReqVo);
+        } catch (Exception e) {
+            log.error("璐圭敤---瀹℃壒鏈�氳繃閽夐拤閫氱煡澶辫触锛宖undId={}", serviceFund.getId(), e);
+        }
         serviceFund.setRecordstatus(RecordStatus);
         serviceFund.setFlowlevel(FlowLevel.longValue());
         //  serviceFund.setBackflowlevel(serviceFund.getFlowlevel());

--
Gitblit v1.9.3