添加目录字段

one-certificate-manager/src/main/java/com/mortals/xhx/module/child/service/impl/ChildLicenseServiceImpl.java

@@ -25,6 +25,8 @@ import com.mortals.xhx.module.child.dao.ChildLicenseDao;
 import com.mortals.xhx.module.child.model.ChildLicenseEntity;
 import com.mortals.xhx.module.child.service.ChildLicenseService;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.util.ObjectUtils;
+
 /**
 * ChildLicenseService
 * 行业许可子证 service实现
@@ -69,10 +71,12 @@ public class ChildLicenseServiceImpl extends AbstractCRUDServiceImpl<ChildLicens
                 this.update(oldChildList);
             }
             if(isAdd) {
-//                List<CertificateChildEntity> childEntityList = certificateChildService.find(new CertificateChildQuery().catalogId(applyLogEntity.getCatalogId()));
-//                List<Long> documentIdList = childEntityList.stream().map(CertificateChildEntity::getDocumentId).collect(Collectors.toList());
-//
-                List<CertificateDocumentEntity> documentEntityList = certificateDocumentService.find(new CertificateDocumentQuery().status(StatusEnum.ENABLE.getValue()));
+                List<CertificateChildEntity> childEntityList = certificateChildService.find(new CertificateChildQuery().catalogId(applyLogEntity.getCatalogId()));
+                List<Long> documentIdList = childEntityList.stream().map(CertificateChildEntity::getDocumentId).collect(Collectors.toList());
+               if(ObjectUtils.isEmpty(documentIdList)) return result;
+                CertificateDocumentQuery certificateDocumentQuery = new CertificateDocumentQuery();
+                certificateDocumentQuery.setIdList(documentIdList);
+                List<CertificateDocumentEntity> documentEntityList = certificateDocumentService.find(certificateDocumentQuery);
                 if (CollectionUtils.isNotEmpty(documentEntityList)) {
                     List<ChildLicenseEntity> childLicense = new ArrayList<>();
                     for (CertificateDocumentEntity item : documentEntityList) {