From c8db0d9987935b82c4a8ca97ce6aaafd19c1f707 Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期二, 02 六月 2026 17:33:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/collaborativeApproval/service/impl/EnterpriseNewsServiceImpl.java | 2 +-
1 files changed, 1 insertions(+), 1 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..4a4d9c1 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());
--
Gitblit v1.9.3