From 3d2fd3a3f7d0571721b0f894e07c80553fd1e26c Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 10 六月 2026 11:12:05 +0800
Subject: [PATCH] fix(approve): 修复审批流程中的SQL查询和跳转路径问题

---
 src/main/java/com/ruoyi/collaborativeApproval/service/impl/EnterpriseNewsServiceImpl.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ruoyi/collaborativeApproval/service/impl/EnterpriseNewsServiceImpl.java b/src/main/java/com/ruoyi/collaborativeApproval/service/impl/EnterpriseNewsServiceImpl.java
index 2d89e2c..daa1c89 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/service/impl/EnterpriseNewsServiceImpl.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/service/impl/EnterpriseNewsServiceImpl.java
@@ -367,7 +367,7 @@
         }
 
         ApprovalInstance approvalInstance = new ApprovalInstance();
-        approvalInstance.setInstanceNo(OrderUtils.countTodayByCreateTime(approvalInstanceMapper, "SP", "instance_no"));
+        approvalInstance.setInstanceNo(OrderUtils.countTodayByCreateTime(approvalInstanceMapper, "SP", "instance_no", enterpriseNews.getCreateTime() != null ? enterpriseNews.getCreateTime() : LocalDateTime.now()));
         approvalInstance.setTemplateId(enterpriseNewsDto.getTemplateId());
         approvalInstance.setTemplateName(templateName);
         approvalInstance.setBusinessId(enterpriseNews.getId());
@@ -403,7 +403,7 @@
 
         String title = StringUtils.isNotEmpty(instance.getTemplateName()) ? instance.getTemplateName() : "瀹℃壒鎻愰啋";
         String message = "瀹℃壒鍗曞彿 " + instance.getInstanceNo() + " 闇�瑕佹偍瀹℃壒";
-        String jumpPath = "/officeProcessAutomation/ApproveManage/approve-list/?id=" + instance.getId();
+        String jumpPath = "/collaborativeApproval/approve-list/?id=" + instance.getId();
         sysNoticeService.simpleNoticeByUser(title, message, approverIds, jumpPath);
     }
 }

--
Gitblit v1.9.3