新增：

1.社区查询-搜索居民 /icresiuser/search

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java

@@ -346,6 +346,8 @@ public class IcUserDemandRecController implements ResultDataResolver {
             return new Result();
         }
 
+        keyword = keyword.trim();
+
         LoginUserDetailsFormDTO form = new LoginUserDetailsFormDTO();
         form.setApp(loginUser.getApp());
         form.setClient(loginUser.getClient());

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java

@@ -103,6 +103,7 @@ public class HouseController implements ResultDataResolver {
             return new Result<IcNeighborHoodResultDTO>().ok(r);
         }
 
+        keyword = keyword.trim();
         String neighborhoodName;
         String buildingName;
 

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiUserPageFormDTO.java

@@ -37,5 +37,11 @@ public class IcResiUserPageFormDTO implements Serializable {
 
     @NotBlank(message = "当前用户id不能为空", groups = AddUserInternalGroup.class)
     private String staffId;
+
+    /**
+     * 关键词
+     */
+    private String keyword;
+
 }
 

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

@@ -640,4 +640,32 @@ public class IcResiUserController {
         }
         return new Result<>();
     }
+
+    /**
+     * 【社区查询】搜索居民们
+     * @param input
+     * @return
+     */
+    @PostMapping("search")
+    public Result<PageData<Map<String, Object>>> searchResi(@RequestBody IcResiUserPageFormDTO input, @LoginUser TokenDto loginUser) {
+        if (StringUtils.isBlank(input.getKeyword())) {
+            PageData<Map<String, Object>> r = new PageData<Map<String, Object>>(new ArrayList<>(), 0);
+            return new Result<PageData<Map<String, Object>>>().ok(r);
+        }
+
+        input.setKeyword(input.getKeyword().trim());
+        input.setCustomerId(loginUser.getCustomerId());
+        input.setStaffId(loginUser.getUserId());
+        input.setFormCode("resi_base_info");
+        if (input.getPageNo() == null) {
+            input.setPageNo(1);
+        }
+
+        if (input.getPageSize() == null) {
+            input.setPageSize(20);
+        }
+
+        PageData<Map<String, Object>> r = icResiUserService.pageResiMap(input);
+        return new Result<PageData<Map<String, Object>>>().ok(r);
+    }
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java

@@ -59,7 +59,8 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
                                                @Param("subTables") List<String> subTables,
                                                @Param("currentStaffAgencyId")String currentStaffAgencyId,
                                                @Param("staffOrgPath") String staffOrgPath,
-                                               @Param("resultTableName")String resultTableName);
+                                               @Param("resultTableName")String resultTableName,
+                                               @Param("keyword") String keyword);
     /**
      * 查询主表
      *

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java

@@ -348,15 +348,14 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                     formDTO.getConditions(),
                     resultColumns,
                     subTables,
-                    staffInfoCacheResult.getAgencyId(), finalStaffOrgPath,null
-                    ));
+                    staffInfoCacheResult.getAgencyId(), finalStaffOrgPath,null, formDTO.getKeyword()));
         }else{
             List<Map<String,Object>> list=baseDao.selectListResiMap(formDTO.getCustomerId(),
                     formDTO.getFormCode(),
                     formDTO.getConditions(),
                     resultColumns,
                     subTables,staffInfoCacheResult.getAgencyId(),
-                    staffOrgPath,null);
+                    staffOrgPath,null, formDTO.getKeyword());
             pageInfo.setTotal(CollectionUtils.isEmpty(list)?NumConstant.ZERO:list.size());
             pageInfo.setList(list);
         }

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

@@ -51,6 +51,13 @@
         <if test="resultTableName != null and resultTableName != ''">
             AND ${resultTableName}.ID IS NOT NULL
         </if>
+        <if test="keyword != null and keyword != ''">
+            AND (
+                NAME = #{keyword}
+                or MOBILE = #{keyword}
+                or ID_CARD = #{keyword}
+                )
+        </if>
         and ic_resi_user.customer_id=#{customerId}
         and (ic_resi_user.AGENCY_ID =#{currentStaffAgencyId} or ic_resi_user.pids like concat(#{staffOrgPath},'%'))
         <if test="null != conditions and conditions.size() > 0">