From 87fefea2fd3f039b6ecbad3b1a038064ef2b3759 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 24 Aug 2022 11:21:14 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9A=82=E6=97=B6=E6=94=BE=E5=BC=80del=5Ff?=
 =?UTF-8?q?lag?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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 976ab930d6..9373743976 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
@@ -1205,7 +1205,7 @@
     <select id="getListIcResiUserDTO" parameterType="map" resultType="com.epmet.dto.IcResiUserDTO">
         select id, NAME,MOBILE
         from ic_resi_user
-        WHERE  DEL_FLAG = '0'
+        WHERE 1=1
         <foreach collection="icResiUserIdList" item="icResiUserId" open="AND (" separator="or" close=")">
            id = #{icResiUserId}
         </foreach>

From 3c12af0ee8c9078b25435aec40de41858097322e Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Thu, 25 Aug 2022 16:26:46 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E5=A4=84=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/grid/controller/ResiMineGridController.java   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/controller/ResiMineGridController.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/controller/ResiMineGridController.java
index e39bd2182c..c9a2f9996e 100644
--- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/controller/ResiMineGridController.java
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/controller/ResiMineGridController.java
@@ -7,6 +7,7 @@ import com.epmet.dto.form.LatestGridInfoFormDTO;
 import com.epmet.dto.result.AllGridsByUserIdResultDTO;
 import com.epmet.dto.result.LatestGridInfoResultDTO;
 import com.epmet.modules.grid.service.ResiMineGridService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -63,7 +64,12 @@ public class ResiMineGridController {
 		//formDTO.setAppId(appId);
 		formDTO.setCustomerId(token.getCustomerId());
 		formDTO.setUserId(token.getUserId());
-		return new Result<LatestGridInfoResultDTO>().ok(resiMineGridService.latestGridInfo(formDTO));
+		LatestGridInfoResultDTO data = resiMineGridService.latestGridInfo(formDTO);
+		//todo 兼容 一个老的 等删除这个if就行
+		if ((data == null || StringUtils.isBlank(data.getGridId())&&"c2527f3d5cb8958583cc1348c328a784".equals(token.getCustomerId()))){
+			return new Result<LatestGridInfoResultDTO>().ok(null);
+		}
+		return new Result<LatestGridInfoResultDTO>().ok(data);
 	}
 
 	/**