Merge branch 'main' of jihulab.com:motive-power/certificate

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/GradDTOServiceImpl.java

@@ -15,11 +15,11 @@ public class GradDTOServiceImpl implements GradDTOService {
     @Override
     public GradDTO getInfo(QueryEntity queryEntity) {
         GradDTO dto = mapper.getInfo(queryEntity);
-//        if (dto == null && queryEntity.getCertType() == 1){
-//            //该情况为结业证书为空时，再搜索学时证明是否有数据
-//            queryEntity.setCertType(2);
-//            dto = mapper.getInfo(queryEntity);
-//        }
+        if (dto == null && queryEntity.getCertType() == 1){
+            //该情况为结业证书为空时，再搜索学时证明是否有数据
+            queryEntity.setCertType(2);
+            dto = mapper.getInfo(queryEntity);
+        }
         return dto;
     }
 }