徽章认证修改

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java

@@ -190,7 +190,8 @@ public enum EpmetErrorCode {
 	NOTICE_BE_OVERDUE(8915,"通知已过期不允许再次变更"),
 
 	SAME_RULE_NAME(8916,"该积分事件已存在，请重新调整保存"),
-	UP_LIMIT_POINT(8917,"积分上限需为单位积分倍数，请重新调整保存");
+	UP_LIMIT_POINT(8917,"积分上限需为单位积分倍数，请重新调整保存"),
+	BADGE_CHECK(8918,"");
 
 
 	private int code;

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

@@ -247,6 +247,7 @@ public class UserBadgeServiceImpl implements UserBadgeService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Result authBadgeRecord(CertificationAddFormDTO certificationAddFormDTO) {
+        // 校验这个徽章此人有没有
         Integer recordCount = userBadgeCertificateRecordDao.selectIsExist(certificationAddFormDTO.getBadgeId(), certificationAddFormDTO.getUserId());
         if (recordCount>NumConstant.ZERO){
             throw new RenException("不允许重复提交审核");
@@ -293,10 +294,12 @@ public class UserBadgeServiceImpl implements UserBadgeService {
         }
         Set<String> requiredColumns = authFieldResultDTOS.stream()
                 .filter(o -> NumConstant.ONE_STR.equals(o.getIsRequired()))
-                .map(AuthFieldResultDTO::getEnName).collect(Collectors.toSet());
+                .map(AuthFieldResultDTO::getCnName).collect(Collectors.toSet());
         List<String> missColumns = ValidatorUtils.hasAllRequired(JSON.toJSONString(certificationAddFormDTO), requiredColumns);
         if (!CollectionUtils.isEmpty(missColumns)) {
-            throw new RenException(JSON.toJSONString(missColumns).concat("不能为空"));
+            EpmetErrorCode.BADGE_CHECK.setMsg(JSON.toJSONString(missColumns).concat("不能为空"));
+            throw new RenException(EpmetErrorCode.BADGE_CHECK.getCode());
+//            throw new RenException(JSON.toJSONString(missColumns).concat("不能为空"));
         }
     }
 
@@ -360,6 +363,7 @@ public class UserBadgeServiceImpl implements UserBadgeService {
      */
     @Override
     public List<AuthFieldResultDTO> authField(AuthFieldFormDTO authFieldFormDTO) {
+        // 查询徽章要显示的认证信息字段
         List<AuthFieldResultDTO> authFieldResultDTOS = userBadgeDao.selectAuthField(authFieldFormDTO);
         if (CollectionUtils.isEmpty(authFieldResultDTOS)){
             authFieldFormDTO.setCustomerId(BadgeConstant.DEFAULT_CUSTOMER);