From e9875d098b19b1408fe345f0206479c7f72d657a Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Tue, 16 Apr 2024 11:25:49 +0800
Subject: [PATCH] 管理公约
---
src/main/java/org/springblade/modules/discuss/mapper/UserTopicsMapper.xml | 2 +-
src/main/java/org/springblade/modules/discuss/service/impl/UserTopicsServiceImpl.java | 2 +-
src/main/java/org/springblade/modules/discuss/excel/holdExcel.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/discuss/excel/holdExcel.java b/src/main/java/org/springblade/modules/discuss/excel/holdExcel.java
index 55337bf..c8eca6b 100644
--- a/src/main/java/org/springblade/modules/discuss/excel/holdExcel.java
+++ b/src/main/java/org/springblade/modules/discuss/excel/holdExcel.java
@@ -51,7 +51,7 @@
@ExcelProperty( "是否投票")
private String voteFlag;
- @ExcelProperty( "管理规约")
+ @ExcelProperty( "管理公约")
private String managementRegulations;
@ExcelProperty( "议事规则")
diff --git a/src/main/java/org/springblade/modules/discuss/mapper/UserTopicsMapper.xml b/src/main/java/org/springblade/modules/discuss/mapper/UserTopicsMapper.xml
index d0e3e6e..dd647d3 100644
--- a/src/main/java/org/springblade/modules/discuss/mapper/UserTopicsMapper.xml
+++ b/src/main/java/org/springblade/modules/discuss/mapper/UserTopicsMapper.xml
@@ -203,7 +203,7 @@
LEFT JOIN jczz_house jhs on jhs.house_code= jda.address_code
<where>
and jt.discuss_content != '议事规则'
- and jt.discuss_content != '管理规约'
+ and jt.discuss_content != '管理公约'
<if test="id != null ">and jut.id = #{id}</if>
<if test="name != null and name != ''">
and bu.name like concat('%',#{name},'%')
diff --git a/src/main/java/org/springblade/modules/discuss/service/impl/UserTopicsServiceImpl.java b/src/main/java/org/springblade/modules/discuss/service/impl/UserTopicsServiceImpl.java
index d288483..410328f 100644
--- a/src/main/java/org/springblade/modules/discuss/service/impl/UserTopicsServiceImpl.java
+++ b/src/main/java/org/springblade/modules/discuss/service/impl/UserTopicsServiceImpl.java
@@ -378,7 +378,7 @@
private void setManagementRegulationsOrRulesOfProcedure(holdExcel item, TopicsEntity topics) {
if (StringUtils.isNotBlank(topics.getDiscussContent())) {
- if (topics.getDiscussContent().equals("管理规约")) {
+ if (topics.getDiscussContent().equals("管理公约")) {
item.setManagementRegulations(topics.getOptionContent());
} else if (topics.getDiscussContent().equals("议事规则")) {
item.setRulesOfProcedure(topics.getOptionContent());
--
Gitblit v1.9.3