From 4cbb882805346d25474a259adc97f3c988024435 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 8 Jul 2022 09:26:38 +0800
Subject: [PATCH 1/3] bugfix

---
 .../src/main/resources/mapper/IcResiUserDao.xml                  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
index 73d9b8ee4d..737d0500de 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
@@ -330,6 +330,7 @@
         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'">
                     AND (AGENCY_ID = #{id} OR PIDS LIKE CONCAT('%',#{id},'%'))

From 077ce1bb6dc8f7322118c38df4dcbba078aeec0e Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 8 Jul 2022 09:30:20 +0800
Subject: [PATCH 2/3] bugfix

---
 .../epmet/controller/IcResiUserController.java   |  2 --
 .../src/main/resources/mapper/IcResiUserDao.xml  | 16 ++++++++++++----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
index 0cde5e57af..9becc91a97 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
+++ b/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));
     }
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
index 737d0500de..54d77d9ad5 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
@@ -333,16 +333,24 @@
             AND (AGENCY_ID = #{agencyId} OR PIDS LIKE CONCAT('%',#{agencyId},'%'))
             <if test="level != null and level != ''">
                 <if test="level=='agency'">
-                    AND (AGENCY_ID = #{id} OR PIDS LIKE CONCAT('%',#{id},'%'))
+                    <if test="id != null and id != ''">
+                        AND (AGENCY_ID = #{id} OR PIDS LIKE CONCAT('%',#{id},'%'))
+                    </if>
                 </if>
                 <if test="level=='grid'">
-                    AND GRID_ID = #{id}
+                    <if test="id != null and id != ''">
+                        AND GRID_ID = #{id}
+                    </if>
                 </if>
                 <if test="level=='neighborHood'">
-                    AND VILLAGE_ID = #{id}
+                    <if test="id != null and id != ''">
+                        AND VILLAGE_ID = #{id}
+                    </if>
                 </if>
                 <if test="level=='building'">
-                    AND BUILD_ID = #{id}
+                    <if test="id != null and id != ''">
+                        AND BUILD_ID = #{id}
+                    </if>
                 </if>
             </if>
         <if test="name != null and name != ''">

From 4f01887cf7c376399a484e11211f1eac55d90836 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Fri, 8 Jul 2022 14:09:21 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=8F=8C=E5=AE=9E=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=BD=95=E5=85=A5-=E5=B0=8F=E5=8C=BA=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E5=A4=87=E6=B3=A8=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/IcNeighborHoodServiceImpl.java   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java
index 7c26b4a947..14c9af3048 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java
+++ b/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);
     }
 
 }