From f4f5dd1ae11f65099d401321375f5522223036aa Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 9 Mar 2023 11:07:23 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=85=9A=E5=91=98=E5=BE=BD=E7=AB=A0?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E9=80=9A=E8=BF=87=E5=A4=87=E6=B3=A8=EF=BC=9A?=
 =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF=E6=98=AF=E5=85=9A=E5=91=98?=
 =?UTF-8?q?=EF=BC=8C=E5=BE=BD=E7=AB=A0=E7=94=B3=E8=AF=B7=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E9=80=9A=E8=BF=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/service/impl/UserBadgeServiceImpl.java     | 4 ++++
 1 file changed, 4 insertions(+)

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 3f91dc4c78..8d691d4252 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
@@ -281,6 +281,7 @@ public class UserBadgeServiceImpl implements UserBadgeService {
             }
         }
         // 0309:如果是党员徽章去判断居民信息-类别是否是党员
+        String auditRemark="";
         BadgeEntity badgeEntity = badgeDao.selectBadgeInfo(EpmetRequestHolder.getLoginUserCustomerId(),certificationAddFormDTO.getBadgeId());
         if (null == badgeEntity) {
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "徽章信息查询异常", "徽章信息查询异常");
@@ -289,6 +290,7 @@ public class UserBadgeServiceImpl implements UserBadgeService {
             // 如果是党员徽章，去查看居民信息-类别
             IcResiUserDTO icResiUserDTO = SpringContextUtils.getBean(IcResiUserService.class).getByResiId(certificationAddFormDTO.getIdcard());
             if (null != icResiUserDTO && NumConstant.ONE_STR.equals(icResiUserDTO.getIsParty())) {
+                auditRemark ="居民信息是党员，徽章申请自动通过";
                 certificationAddFormDTO.setAutoPassFlag(true);
             }
         }
@@ -333,6 +335,7 @@ public class UserBadgeServiceImpl implements UserBadgeService {
             //审核状态 approved:审核通过，rejected:审核驳回;auditing:审核中
             badgeAuditFormDTO.setAuditStatus(BadgeConstant.APPROVED);
             badgeAuditFormDTO.setCurrentUserId("APP_USER");
+            badgeAuditFormDTO.setAuditRemark(auditRemark);
             autoPassBadge(badgeAuditFormDTO);
         }
         Map resultMap=new HashMap();
@@ -351,6 +354,7 @@ public class UserBadgeServiceImpl implements UserBadgeService {
         dto.setStaffId(badgeAuditFormDTO.getCurrentUserId());
         dto.setIsLast(BadgeConstant.YES);
         dto.setAuditTime(new Date());
+        dto.setAuditRemark(badgeAuditFormDTO.getAuditRemark());
         SpringContextUtils.getBean(UserBadgeCertificateRecordService.class).update(dto);
 
         ResiUserBadgeDTO resiUserBadgeDTO = new ResiUserBadgeDTO();

From 2a6b38dac0359e7e4c46e6afb8af014b8aa4786d Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 9 Mar 2023 11:08:27 +0800
Subject: [PATCH 2/2] /epmetuser/more/badge/certification/detail

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

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 3a19f2e354..f9f8390cd1 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
@@ -121,7 +121,7 @@
             b.BADGE_NAME as badgeName
         FROM
             user_badge_certificate_record r
-        left join badge b  on(r.BADGE_ID=b.id)
+        left join badge b  on(r.BADGE_ID=b.id and r.CUSTOMER_ID=b.CUSTOMER_ID)
         WHERE
             r.DEL_FLAG = 0
             AND r.BADGE_ID = #{badgeId}