Merge branch 'dev' into release_temp

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;
 }

epmet-user/epmet-user-server/src/main/resources/mapper/GovStaffRoleDao.xml

@@ -132,11 +132,13 @@
             gov_staff_role
         WHERE
             DEL_FLAG = 0
-          AND (
+        <if test="roleIds != null and roleIds.size() > 0">
-              <foreach collection="roleIds" item="roleId" separator=" OR ">
+            AND (
-                  ID = #{roleId}
+            <foreach collection="roleIds" item="roleId" separator=" OR ">
-              </foreach>
+                ID = #{roleId}
+            </foreach>
             )
+        </if>
     </select>
     <select id="getStaffRoles" resultType="com.epmet.entity.GovStaffRoleEntity">
         SELECT