Merge remote-tracking branch 'origin/房屋tree_yzm' into dev

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/ListStaffFormDTO.java

@@ -25,4 +25,9 @@ public class ListStaffFormDTO implements Serializable {
     private String customerId;
     public interface Staff extends CustomerClientShowGroup {}
 
+    /**
+     * 手机号
+     * 可以不填
+     */
+    private String mobile;
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/CustomerStaffDao.java

@@ -53,7 +53,9 @@ public interface CustomerStaffDao extends BaseDao<CustomerStaffEntity> {
      * @Description 模糊查询用户、角色信息
      * @author sun
      */
-    List<ListStaffResultDTO> selectByRealName(@Param("customerId") String customerId, @Param("realName") String realName);
+    List<ListStaffResultDTO> selectByRealName(@Param("customerId") String customerId,
+                                              @Param("realName") String realName,
+                                              @Param("mobile") String mobile);
 
     /**
      * @Description 分页查询排好序的工作人员Id列表

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java

@@ -537,7 +537,7 @@ public class EpmetUserServiceImpl implements EpmetUserService {
     @Override
     public List<ListStaffResultDTO> listStaff(ListStaffFormDTO formDTO) {
         //1.模糊查询用户、角色信息
-        List<ListStaffResultDTO> resultList = customerStaffDao.selectByRealName(formDTO.getCustomerId(), formDTO.getRealName());
+        List<ListStaffResultDTO> resultList = customerStaffDao.selectByRealName(formDTO.getCustomerId(), formDTO.getRealName(),formDTO.getMobile());
         if (null == resultList || resultList.size() < NumConstant.ONE) {
             return new ArrayList<>();
         }

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/CustomerStaffDao.xml

@@ -49,7 +49,12 @@
         WHERE
             del_flag = '0'
         AND customer_id = #{customerId}
-        AND real_name LIKE CONCAT('%', #{realName}, '%')
+        <if test='null != realName and "" !=realName'>
+            AND real_name LIKE CONCAT('%', #{realName}, '%')
+        </if>
+        <if test='null != mobile and "" !=mobile'>
+            and MOBILE LIKE CONCAT('%', #{mobile}, '%')
+        </if>
     </select>
 
     <select id="selectOrderRole" resultType="java.lang.String">

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

@@ -21,9 +21,12 @@ public class ChangeWelfareDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;
     public interface AddUserShowGroup extends CustomerClientShowGroup {}
+
+    public interface RemoveWelfareShowGroup extends CustomerClientShowGroup {}
     /**
      * 主键
      */
+    @NotBlank(message = "id不能为空",groups = RemoveWelfareShowGroup.class)
 	private String id;
 
     /**
@@ -81,7 +84,7 @@ public class ChangeWelfareDTO implements Serializable {
     /**
      * 移除原因
      */
-    @Length(max = 250,message = "移除原因最多输入250字",groups = AddUserShowGroup.class)
+    @Length(max = 250,message = "移除原因最多输入250字",groups = RemoveWelfareShowGroup.class)
 	private String removeReason;
 
     /**

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

@@ -108,6 +108,7 @@ public class ChangeWelfareController {
     @NoRepeatSubmit
     @PostMapping("removeWelfare")
     public Result removeWelfare(@RequestBody ChangeWelfareDTO dto){
+        ValidatorUtils.validateEntity(dto,ChangeWelfareDTO.RemoveWelfareShowGroup.class);
         return changeWelfareService.removeWelfare(dto);
     }