字典模块开发

sckw-modules/sckw-system/src/main/java/com/sckw/system/repository/KwsEnterpriseRepository.java

@@ -45,4 +45,12 @@ public class KwsEnterpriseRepository extends ServiceImpl<KwsEnterpriseDao,KwsEnt
                 .in(KwsEnterprise::getId, entIds)
                 .like(StringUtils.isNotBlank(entName), KwsEnterprise::getFirmName, entName));
     }
+
+    public List<KwsEnterprise> queryByParentEntIds(Set<Long> entIds) {
+        return list(Wrappers.<KwsEnterprise>lambdaQuery()
+                .eq(BaseModel::getDelFlag, 0)
+                .eq(BaseModel::getStatus, 0)
+                .eq(KwsEnterprise::getApproval, ApprovalEnum.OK.getCode())
+                .in(KwsEnterprise::getPid, entIds));
+    }
 }

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsEnterpriseService.java

@@ -1506,6 +1506,12 @@ public class KwsEnterpriseService {
             return new EntInfoResp();
         }
         Set<Long> entIds = kwsEnterprises.stream().map(BaseModel::getId).collect(Collectors.toSet());
+
+        //查询父企业
+        List<KwsEnterprise> parentEnts  =kwsEnterpriseRepository.queryByParentEntIds(entIds);
+        if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(parentEnts)){
+            kwsEnterprises.addAll(parentEnts);
+        }
         //根据类型进行过滤
         List<KwsEntType> kwsEntTypes = kwsEntTypeRepository.queryByEntIdsAndType(entIds, req.getEntType());
         if (CollectionUtils.isEmpty(kwsEntTypes)) {