diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CertificationDetailFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CertificationDetailFormDTO.java
index 1eea42f575..9618efac5d 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CertificationDetailFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CertificationDetailFormDTO.java
@@ -23,7 +23,7 @@ public class CertificationDetailFormDTO implements Serializable {
private String badgeId;
/**
- * 客户ID
+ * 审核记录ID
*/
- private String userId;
+ private String recordId;
}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserBadgeDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserBadgeDao.java
index c979c06d0a..082b0051cb 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserBadgeDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserBadgeDao.java
@@ -86,7 +86,7 @@ public interface UserBadgeDao {
* @author zxc
* @date 2020/11/4 4:09 下午
*/
- CertificationDetailResultDTO selectBadgeAuthRecord(@Param("userId")String userId, @Param("badgeId")String badgeId);
+ CertificationDetailResultDTO selectBadgeAuthRecord(@Param("userId")String userId, @Param("badgeId")String badgeId,@Param("recordId")String recordId);
/**
* @Description 个人中心-查询徽章要显示的认证信息字段
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 531b6fea47..7999e694b6 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
@@ -212,7 +212,7 @@ public class UserBadgeServiceImpl implements UserBadgeService {
/**
* @Description 个人中心-获取徽章认证页面详情
- * 先判断 userId存在不,不存在从tokenDto获取【工作端和居民端合用一个接口】
+ * 先判断 recordId存在不,不存在是居民端,反之,工作端【工作端和居民端合用一个接口】
* @Param tokenDto
* @Param certificationDetailFormDTO
* @author zxc
@@ -220,10 +220,10 @@ public class UserBadgeServiceImpl implements UserBadgeService {
*/
@Override
public CertificationDetailResultDTO certificationDetail(TokenDto tokenDto, CertificationDetailFormDTO certificationDetailFormDTO) {
- if (StringUtils.isEmpty(certificationDetailFormDTO.getUserId())){
- certificationDetailFormDTO.setUserId(tokenDto.getUserId());
+ if (StringUtils.isNotBlank(certificationDetailFormDTO.getRecordId())){
+ return userBadgeDao.selectBadgeAuthRecord(null, certificationDetailFormDTO.getBadgeId(),certificationDetailFormDTO.getRecordId());
}
- return userBadgeDao.selectBadgeAuthRecord(certificationDetailFormDTO.getUserId(), certificationDetailFormDTO.getBadgeId());
+ return userBadgeDao.selectBadgeAuthRecord(tokenDto.getUserId(), certificationDetailFormDTO.getBadgeId(),certificationDetailFormDTO.getRecordId());
}
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 7e46626d18..1ce902f6d2 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
@@ -107,7 +107,12 @@
DEL_FLAG = 0
AND IS_LAST = 'yes'
AND BADGE_ID = #{badgeId}
- AND USER_ID = #{userId}
+
+ AND USER_ID = #{userId}
+
+
+ AND ID = #{recordId}
+