Merge remote-tracking branch 'origin/main'

ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/QueryEntity.java

@@ -10,4 +10,5 @@ import lombok.NoArgsConstructor;
 public class QueryEntity {
     private String certNumber; //证书编号
     private String userName;  //姓名
+    private Integer certType; //证书类型
 }

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

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

ruoyi-system/src/main/resources/mapper/system/GradDTOMapper.xml

@@ -21,7 +21,7 @@
                a.id,
                b.url
         FROM grad_table a LEFT JOIN template_table b ON a.template_id = b.id
-        WHERE a.cert_id = #{certNumber} AND a.uesr_name = #{userName}
+        WHERE a.cert_id = #{certNumber} AND a.uesr_name = #{userName} AND a.cert_type = #{certType}
     </select>
 
 </mapper>