From 58bf5a27340d09c0eef89bd21839310ef036c3a0 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 21 Feb 2023 10:43:30 +0800
Subject: [PATCH] page

---
 .../src/main/java/com/epmet/dto/ChangeWelfareDTO.java         | 2 ++
 .../java/com/epmet/controller/ChangeWelfareController.java    | 4 ++--
 .../src/main/resources/mapper/ChangeWelfareDao.xml            | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeWelfareDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeWelfareDTO.java
index ef8ec9ae08..f04be7b82e 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeWelfareDTO.java
+++ b/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;
 
     /**
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeWelfareController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeWelfareController.java
index 671c4c8681..c3ea057e9b 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeWelfareController.java
+++ b/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();
     }
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeWelfareDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeWelfareDao.xml
index f45370a95f..9c4a45bc10 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeWelfareDao.xml
+++ b/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