c-zhouhf1/zhgh_jshvc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commit

Browse Source
This commit is contained in:
@jyuhsin
2025-12-22 18:00:36 +08:00
parent 7699434fea
commit 517a61c1e7
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/zhgh/democratic/proposal/service/common/ProposalCommonServiceImpl.java
+1 -1
View File
@@ -556,7 +556,7 @@ public class ProposalCommonServiceImpl extends BaseServiceImpl<ProposalInfo> imp
if (ObjectUtil.isNotEmpty(nextSession)) { if (ObjectUtil.isNotEmpty(nextSession)) {
docData.put("newSessionYear", nextSession.getStartDate().getYear()); docData.put("newSessionYear", nextSession.getStartDate().getYear());
docData.put("newSessionMonth", nextSession.getStartDate().getMonth()); 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("newSessionName", nextSession.getFullName());
docData.put("currentMonth", DateUtil.thisMonth()); docData.put("currentMonth", DateUtil.thisMonth());
src/main/resources/static/assets/platform/js/util/commonUtil.js
+2 -2
View File
@@ -74,11 +74,11 @@ const commonUtil = {
const content = reader.result const content = reader.result
// 将字符串解析为 JSON 对象 // 将字符串解析为 JSON 对象
const jsonObject = JSON.parse(content) const jsonObject = JSON.parse(content)
this.$message.error(jsonObject.msg) ELEMENT.Message.error(jsonObject.msg)
} }
reader.readAsText(response.data) reader.readAsText(response.data)
} catch (err) { } catch (err) {
this.$message.error("下载文件出错") ELEMENT.Message.error("下载文件出错")
} }
return return
} }