Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserBadgeController.java

@@ -77,7 +77,7 @@ public class UserBadgeController {
         certificationAddFormDTO.setUserId(tokenDto.getUserId());
         certificationAddFormDTO.setSendMsgFlag(false);
         // 是否自动通过
-        certificationAddFormDTO.setAutoPassFlag(true);
+        certificationAddFormDTO.setAutoPassFlag(false);
         ValidatorUtils.validateEntity(certificationAddFormDTO, CertificationAddFormDTO.CertificationAdd.class);
         return userBadgeService.authBadgeRecord(certificationAddFormDTO);
     }

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

@@ -404,7 +404,12 @@ public class UserBadgeServiceImpl implements UserBadgeService {
     public CertificationDetailResultDTO certificationDetail(TokenDto tokenDto, CertificationDetailFormDTO certificationDetailFormDTO) {
         //工作端
         if (StringUtils.isNotBlank(certificationDetailFormDTO.getRecordId())){
-            return userBadgeDao.selectBadgeAuthRecord(null, certificationDetailFormDTO.getBadgeId(),certificationDetailFormDTO.getRecordId());
+            CertificationDetailResultDTO res= userBadgeDao.selectBadgeAuthRecord(null, certificationDetailFormDTO.getBadgeId(),certificationDetailFormDTO.getRecordId());
+            GridInfoCache gridInfoCache= CustomerOrgRedis.getGridInfo(res.getGridId());
+            if(null!=gridInfoCache){
+                res.setGridName(gridInfoCache.getGridNamePath());
+            }
+            return res;
         }
         //居民端
         CertificationDetailResultDTO resiResult = userBadgeDao.selectBadgeAuthRecord(tokenDto.getUserId(), certificationDetailFormDTO.getBadgeId(),certificationDetailFormDTO.getRecordId());