From d00f3d2e449b950a7f13e06abc6c7c780fe93a5f Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 6 Mar 2023 13:05:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=BD=E7=AB=A0=E8=AF=A6=E6=83=85=EF=BC=8C?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9EgridName?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/result/CertificationDetailResultDTO.java  | 4 ++++
 .../java/com/epmet/service/impl/UserBadgeServiceImpl.java   | 6 ++++++
 .../src/main/resources/mapper/UserBadgeDao.xml              | 3 ++-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CertificationDetailResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CertificationDetailResultDTO.java
index 63783adc2c..0cab1b7039 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CertificationDetailResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CertificationDetailResultDTO.java
@@ -63,6 +63,8 @@ public class CertificationDetailResultDTO implements Serializable {
      */
     private String recordId;
 
+    private String gridId;
+    private String gridName;
     public CertificationDetailResultDTO() {
         this.surname = "";
         this.name = "";
@@ -74,5 +76,7 @@ public class CertificationDetailResultDTO implements Serializable {
         this.authResult = "";
         this.authReason = "";
         this.recordId = "";
+        this.gridId="";
+        this.gridName="";
     }
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java
index 009870cb44..5d27aaf3ac 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java
@@ -6,6 +6,8 @@ import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
+import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
@@ -413,6 +415,10 @@ public class UserBadgeServiceImpl implements UserBadgeService {
                 resiResult.setIdcard(userInfo.getIdNum());
             }
         }
+        GridInfoCache gridInfoCache= CustomerOrgRedis.getGridInfo(resiResult.getGridId());
+        if(null!=gridInfoCache){
+            resiResult.setGridName(gridInfoCache.getGridNamePath());
+        }
         return resiResult;
     }
 
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml
index 95b77d51a7..e95397c3bf 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml
@@ -115,7 +115,8 @@
             AUDIT_STATUS,
             AUDIT_STATUS AS authResult,
             AUDIT_REMARK AS authReason,
-            ID AS recordId
+            ID AS recordId,
+            GRID_ID as gridId
         FROM
             user_badge_certificate_record
         WHERE