添加水印图片

one-certificate-manager/src/main/java/com/mortals/xhx/module/record/web/ApplyLogController.java

@@ -101,14 +101,23 @@ public class ApplyLogController extends BaseCRUDJsonBodyMappingController<ApplyL
         if(!ObjectUtils.isEmpty(query.getIndustryId())){
             //获取行业与子行业
             CertificateIndustryEntity industryEntity = certificateIndustryService.get(query.getIndustryId());
-            if(ObjectUtils.isEmpty(industryEntity)) return;
+            if(ObjectUtils.isEmpty(industryEntity)){
+                query.setCatalogId(-1L);
+                return;
+            }
             List<Long> industryIdList = certificateIndustryService.find(new CertificateIndustryQuery()
                             .ancestors(industryEntity.getAncestors() + "%"))
                     .stream().map(x -> x.getId()).collect(Collectors.toList());
-            if(ObjectUtils.isEmpty(industryIdList)) return;
+            if(ObjectUtils.isEmpty(industryIdList)) {
+                query.setCatalogId(-1L);
+                return;
+            }
             List<Long> catalogIdlist = certificateCatalogService.find(new CertificateCatalogQuery().industryIdList(industryIdList))
                     .stream().map(x -> x.getId()).collect(Collectors.toList());
-            if(ObjectUtils.isEmpty(catalogIdlist)) return;
+            if(ObjectUtils.isEmpty(catalogIdlist)) {
+                query.setCatalogId(-1L);
+                return;
+            }
             query.setCatalogIdList(catalogIdlist);
         }