徽章

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CertificationDetailResultDTO.java

@@ -26,7 +26,7 @@ public class CertificationDetailResultDTO implements Serializable {
     /**
      * 身份证号
      */
-    private String idCard;
+    private String idcard;
 
     /**
      * 是否认证 yes 认证 no 已认证

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java

@@ -205,6 +205,7 @@ public class UserBadgeServiceImpl implements UserBadgeService {
 
     /**
      * @Description  个人中心-获取徽章认证页面详情
+     * 先判断 userId存在不，不存在从tokenDto获取【工作端和居民端合用一个接口】
      * @Param tokenDto
      * @Param certificationDetailFormDTO
      * @author zxc
@@ -212,7 +213,9 @@ public class UserBadgeServiceImpl implements UserBadgeService {
      */
     @Override
     public CertificationDetailResultDTO certificationDetail(TokenDto tokenDto, CertificationDetailFormDTO certificationDetailFormDTO) {
-        certificationDetailFormDTO.setUserId(tokenDto.getUserId());
+        if (StringUtils.isEmpty(certificationDetailFormDTO.getUserId())){
+            certificationDetailFormDTO.setUserId(tokenDto.getUserId());
+        }
         return userBadgeDao.selectBadgeAuthRecord(certificationDetailFormDTO.getUserId(), certificationDetailFormDTO.getBadgeId());
     }
 

epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml

@@ -89,7 +89,7 @@
         SELECT
             SURNAME,
             NAME,
-            ID_NUM AS idCard,
+            ID_NUM AS idcard,
             ( CASE WHEN AUDIT_STATUS = 'approved' THEN 'yes' ELSE 'no' END ) AS isCertificated,
             MOBILE,
             CERTIFICATION_IMG,