From eb41373dfe4f3357a41b26028da04fd42f116b88 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 16 Jul 2021 14:28:26 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E5=8F=91=E8=A1=A8?=
 =?UTF-8?q?=E5=BB=BA=E8=AE=AE=E9=99=90=E5=88=B6=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/dto/form/PublishSuggestionFormDTO.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/PublishSuggestionFormDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/PublishSuggestionFormDTO.java
index 1261a5e83f..367a1590d3 100644
--- a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/PublishSuggestionFormDTO.java
+++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/PublishSuggestionFormDTO.java
@@ -30,6 +30,6 @@ public class PublishSuggestionFormDTO implements Serializable {
     @NotNull(message = "是否匿名不能为空", groups = {AddUserInternalGroup.class})
     private Boolean publicFlag;
 
-    @Length(max = 500, message = "内容不能超过500字", groups = {AddUserShowGroup.class})
+    @Length(min = 1, max = 500, message = "内容不能为空,且不能超过500字", groups = {AddUserShowGroup.class})
     private String suggestion;
 }

From 6019fd9122717eee9a7f982152531836a07d1582 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Sun, 18 Jul 2021 21:58:21 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9ASQL=E8=AF=AD?=
 =?UTF-8?q?=E6=B3=95=E6=BC=8F=E6=B4=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/GovStaffRoleDao.xml      | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/GovStaffRoleDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/GovStaffRoleDao.xml
index 42ad1a45ab..7712a0b58c 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/GovStaffRoleDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/GovStaffRoleDao.xml
@@ -132,11 +132,13 @@
             gov_staff_role
         WHERE
             DEL_FLAG = 0
-          AND (
-              <foreach collection="roleIds" item="roleId" separator=" OR ">
-                  ID = #{roleId}
-              </foreach>
+        <if test="roleIds != null and roleIds.size() > 0">
+            AND (
+            <foreach collection="roleIds" item="roleId" separator=" OR ">
+                ID = #{roleId}
+            </foreach>
             )
+        </if>
     </select>
     <select id="getStaffRoles" resultType="com.epmet.entity.GovStaffRoleEntity">
         SELECT