From 576610dc0870cb19f3418ed7160809858d709c1b Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 9 Mar 2023 10:24:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E5=91=98=E5=BE=BD=E7=AB=A0=EF=BC=8C?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF-?=
 =?UTF-8?q?=E5=85=9A=E5=91=98=E6=98=AF=EF=BC=8C=E8=87=AA=E5=8A=A8=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E9=80=9A=E8=BF=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/UserBadgeServiceImpl.java    | 19 +++++++++++++++----
 .../main/resources/mapper/IcResiUserDao.xml   |  3 ++-
 2 files changed, 17 insertions(+), 5 deletions(-)

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 c9d673f8c8..572186af5d 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
@@ -19,19 +19,18 @@ import com.epmet.constant.ReadFlagConstant;
 import com.epmet.constant.SmsTemplateConstant;
 import com.epmet.constant.UserMessageTypeConstant;
 import com.epmet.dao.*;
+import com.epmet.dto.IcResiUserDTO;
 import com.epmet.dto.ResiUserBadgeDTO;
 import com.epmet.dto.UserBadgeCertificateRecordDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
+import com.epmet.entity.BadgeEntity;
 import com.epmet.feign.EpmetMessageOpenFeignClient;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.feign.GovOrgFeignClient;
 import com.epmet.redis.UserBadgeRedis;
 import com.epmet.redis.UserBaseInfoRedis;
-import com.epmet.service.ResiUserBadgeService;
-import com.epmet.service.UserBadgeCertificateRecordService;
-import com.epmet.service.UserBadgeService;
-import com.epmet.service.UserBaseInfoService;
+import com.epmet.service.*;
 import com.epmet.util.ModuleConstant;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -280,6 +279,18 @@ public class UserBadgeServiceImpl implements UserBadgeService {
                 return new Result().error(EpmetErrorCode.MOBILE_CODE_ERROR.getCode());
             }
         }
+        // 0309:如果是党员徽章去判断居民信息-类别是否是党员
+        BadgeEntity badgeEntity = badgeDao.selectById(certificationAddFormDTO.getBadgeId());
+        if (null == badgeEntity) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "徽章信息查询异常", "徽章信息查询异常");
+        }
+        if (BadgeConstant.PARTY.equals(badgeEntity.getFixationBadgeType())) {
+            // 如果是党员徽章，去查看居民信息-类别
+            IcResiUserDTO icResiUserDTO = SpringContextUtils.getBean(IcResiUserService.class).getByResiId(certificationAddFormDTO.getIdcard());
+            if (null != icResiUserDTO && NumConstant.ONE_STR.equals(icResiUserDTO.getIsParty())) {
+                certificationAddFormDTO.setAutoPassFlag(true);
+            }
+        }
         UserBadgeCertificateRecordDTO form = ConvertUtils.sourceToTarget(certificationAddFormDTO, UserBadgeCertificateRecordDTO.class);
         List<String> userIds = new ArrayList<>();
         userIds.add(certificationAddFormDTO.getUserId());
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 47bb9cd511..568885f729 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
@@ -476,7 +476,8 @@
             mobile,
             agency_id,
             grid_id,
-            home_id
+            home_id,
+            IS_PARTY as isParty
         FROM
             ic_resi_user
         WHERE