From 517a61c1e7fb53cefcaefb99257da75208a11980 Mon Sep 17 00:00:00 2001 From: "@jyuhsin" <729757837@qq.com> Date: Mon, 22 Dec 2025 18:00:36 +0800 Subject: [PATCH] commit --- .../proposal/service/common/ProposalCommonServiceImpl.java | 2 +- .../resources/static/assets/platform/js/util/commonUtil.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/service/common/ProposalCommonServiceImpl.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/service/common/ProposalCommonServiceImpl.java index 586fab3..cf77bd9 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/proposal/service/common/ProposalCommonServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/proposal/service/common/ProposalCommonServiceImpl.java @@ -556,7 +556,7 @@ public class ProposalCommonServiceImpl extends BaseServiceImpl imp if (ObjectUtil.isNotEmpty(nextSession)) { docData.put("newSessionYear", nextSession.getStartDate().getYear()); docData.put("newSessionMonth", nextSession.getStartDate().getMonth()); - docData.put("newSessionDay", nextSession.getStartDate().getMonth()); + docData.put("newSessionDay", nextSession.getStartDate().getDay()); docData.put("newSessionName", nextSession.getFullName()); docData.put("currentMonth", DateUtil.thisMonth()); diff --git a/src/main/resources/static/assets/platform/js/util/commonUtil.js b/src/main/resources/static/assets/platform/js/util/commonUtil.js index c598b4f..02b9bf4 100644 --- a/src/main/resources/static/assets/platform/js/util/commonUtil.js +++ b/src/main/resources/static/assets/platform/js/util/commonUtil.js @@ -74,11 +74,11 @@ const commonUtil = { const content = reader.result // 将字符串解析为 JSON 对象 const jsonObject = JSON.parse(content) - this.$message.error(jsonObject.msg) + ELEMENT.Message.error(jsonObject.msg) } reader.readAsText(response.data) } catch (err) { - this.$message.error("下载文件出错") + ELEMENT.Message.error("下载文件出错") } return }