page

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeWelfareDTO.java

@@ -70,6 +70,7 @@ public class ChangeWelfareDTO implements Serializable {
     /**
      * 加入原因
      */
+    @Length(max = 250,message = "添加原因最多输入250字",groups = AddUserShowGroup.class)
 	private String joinReason;
 
     /**
@@ -80,6 +81,7 @@ public class ChangeWelfareDTO implements Serializable {
     /**
      * 移除原因
      */
+    @Length(max = 250,message = "移除原因最多输入250字",groups = AddUserShowGroup.class)
 	private String removeReason;
 
     /**

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeWelfareController.java

@@ -70,7 +70,7 @@ public class ChangeWelfareController {
     @PostMapping("save")
     public Result save(@RequestBody ChangeWelfareDTO dto){
         //效验数据
-        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class,ChangeWelfareDTO.AddUserShowGroup.class);
         return changeWelfareService.save(dto);
     }
 
@@ -78,7 +78,7 @@ public class ChangeWelfareController {
     @PostMapping("update")
     public Result update(@RequestBody ChangeWelfareDTO dto){
         //效验数据
-        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class,ChangeWelfareDTO.AddUserShowGroup.class);
         changeWelfareService.update(dto);
         return new Result();
     }

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

@@ -73,7 +73,7 @@
         <if test="categoryName != null and categoryName != ''">
             AND w.CATEGORY_NAME  like concat('%',#{categoryName},'%')
         </if>
-        <if test="grantFlag != null">
+        <if test="grantFlag != null and grantFlag != ''">
             AND w.GRANT_FLAG = #{grantFlag}
         </if>
         order by w.CREATED_TIME desc