Merge branch 'bugfix/teamB_shuangshi' into master_shibei

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java

@@ -793,7 +793,11 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
 
     @Override
     public Result<IcNeighborHoodEntity> neighborhoodDetail(String neighborhoodId) {
-        return new Result<IcNeighborHoodEntity>().ok(baseDao.selectById(neighborhoodId));
+        IcNeighborHoodEntity result = baseDao.selectById(neighborhoodId);
+        if(null != result && null == result.getRemark()){
+            result.setRemark("");
+        }
+        return new Result<IcNeighborHoodEntity>().ok(result);
     }
 
 }

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

@@ -667,8 +667,6 @@ public class IcResiUserController implements ResultDataResolver {
     public Result<PageData<SearchByNameResultDTO>> searchByName(@RequestBody SearchByNameFormDTO formDTO, @LoginUser TokenDto tokenDto) {
         formDTO.setCustomerId(tokenDto.getCustomerId());
         formDTO.setUserId(tokenDto.getUserId());
-        //前端不会传level，这里默认查询当前组织及下级
-        formDTO.setLevel(OrgInfoConstant.AGENCY);
         ValidatorUtils.validateEntity(formDTO, SearchByNameFormDTO.SearchByNameForm.class);
         return new Result<PageData<SearchByNameResultDTO>>().ok(icResiUserService.searchByName(formDTO));
     }

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

@@ -330,20 +330,29 @@
         FROM ic_resi_user
         WHERE DEL_FLAG = '0'
             AND CUSTOMER_ID = #{customerId}
+            AND (AGENCY_ID = #{agencyId} OR PIDS LIKE CONCAT('%',#{agencyId},'%'))
             <if test="level != null and level != ''">
                 <if test="level=='agency'">
+                    <if test="id != null and id != ''">
                         AND (AGENCY_ID = #{id} OR PIDS LIKE CONCAT('%',#{id},'%'))
                     </if>
+                </if>
                 <if test="level=='grid'">
+                    <if test="id != null and id != ''">
                         AND GRID_ID = #{id}
                     </if>
+                </if>
                 <if test="level=='neighborHood'">
+                    <if test="id != null and id != ''">
                         AND VILLAGE_ID = #{id}
                     </if>
+                </if>
                 <if test="level=='building'">
+                    <if test="id != null and id != ''">
                         AND BUILD_ID = #{id}
                     </if>
                 </if>
+            </if>
         <if test="name != null and name != ''">
             AND `NAME` LIKE CONCAT('%',#{name},'%')
         </if>