From 7df0589a9747e999c9d3841d3798f657901515e2 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 5 Aug 2022 15:44:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AE=A2=E6=88=B7ID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dto/result/IcUserMatchGridResultDTO.java     | 2 ++
 .../main/java/com/epmet/service/impl/IcResiUserServiceImpl.java | 1 +
 2 files changed, 3 insertions(+)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcUserMatchGridResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcUserMatchGridResultDTO.java
index 08495ede1c..d3fd271987 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcUserMatchGridResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcUserMatchGridResultDTO.java
@@ -16,5 +16,7 @@ public class IcUserMatchGridResultDTO implements Serializable {
 
     private String gridId;
 
+    private String customerId;
+
     private String gridName;
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
index ebc175dd65..75ee6009e1 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
@@ -3270,6 +3270,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         if (null == gridInfo){
             throw new EpmetException("查询网格信息失败："+icResiUserEntity.getGridId());
         }
+        result.setCustomerId(customerInfo.getId());
         result.setGridId(icResiUserEntity.getGridId());
         result.setGridName(gridInfo.getGridName());
         return result;