From ca6d57f53365c0f3b02d41abc4eab6c58230c025 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 6 Mar 2023 14:54:25 +0800
Subject: [PATCH] =?UTF-8?q?certification/add-autopass=E8=AE=B0=E5=BD=95age?=
 =?UTF-8?q?ncyId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dto/UserBadgeCertificateRecordDTO.java    | 4 ++++
 .../com/epmet/entity/UserBadgeCertificateRecordEntity.java   | 4 ++++
 .../java/com/epmet/service/impl/UserBadgeServiceImpl.java    | 5 +++++
 .../src/main/resources/mapper/UserBadgeDao.xml               | 2 ++
 4 files changed, 15 insertions(+)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserBadgeCertificateRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserBadgeCertificateRecordDTO.java
index 820f0fa45c..7cef9e768f 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserBadgeCertificateRecordDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserBadgeCertificateRecordDTO.java
@@ -16,6 +16,10 @@ public class UserBadgeCertificateRecordDTO implements Serializable {
     private String id;
     private String customerId;
     private String gridId;
+    /**
+     * 组织id;0306烟台需求增加
+     */
+    private String agencyId;
     private String userId;
     private String badgeId;
     private String surname;
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserBadgeCertificateRecordEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserBadgeCertificateRecordEntity.java
index 47ca624036..a036578581 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserBadgeCertificateRecordEntity.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserBadgeCertificateRecordEntity.java
@@ -47,6 +47,10 @@ public class UserBadgeCertificateRecordEntity extends BaseEpmetEntity {
      */
 	private String gridId;
 
+	/**
+	 * 组织id;0306烟台需求增加
+	 */
+	private String agencyId;
 
     /**
      * 用户ID
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 89ef4a4f9e..c9d673f8c8 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
@@ -298,6 +298,11 @@ public class UserBadgeServiceImpl implements UserBadgeService {
         log.info(JSON.toJSONString(form));
         String recordId=IdWorker.getIdStr();
         form.setId(recordId);
+        GridInfoCache gridInfoCache=CustomerOrgRedis.getGridInfo(form.getGridId());
+        if(null==gridInfoCache||StringUtils.isBlank(gridInfoCache.getPid())){
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"查询网格缓存异常","查询网格缓存异常");
+        }
+        form.setAgencyId(gridInfoCache.getPid());
         userBadgeDao.insertUserBadgeCertificateRecord(form);
         if(certificationAddFormDTO.getSendMsgFlag()){
             //TODO 站内信发送
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 e95397c3bf..62d272f323 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
@@ -176,6 +176,7 @@
             ID,
             CUSTOMER_ID,
             GRID_ID,
+            AGENCY_ID,
             USER_ID,
             BADGE_ID,
             SURNAME,
@@ -201,6 +202,7 @@
             #{id},
             #{customerId},
             #{gridId},
+            #{agencyId},
             #{userId},
             #{badgeId},
             #{surname},