diff --git a/src/main/java/com/gxwebsoft/oa/service/impl/OaCompanyServiceImpl.java b/src/main/java/com/gxwebsoft/oa/service/impl/OaCompanyServiceImpl.java index be4b937..efe647d 100644 --- a/src/main/java/com/gxwebsoft/oa/service/impl/OaCompanyServiceImpl.java +++ b/src/main/java/com/gxwebsoft/oa/service/impl/OaCompanyServiceImpl.java @@ -11,6 +11,11 @@ import cn.hutool.core.util.StrUtil; import com.gxwebsoft.oa.entity.OaCompany; import com.gxwebsoft.oa.param.OaCompanyParam; +import com.gxwebsoft.common.system.entity.Dict; +import com.gxwebsoft.common.system.entity.DictData; +import com.gxwebsoft.common.system.param.DictDataParam; +import com.gxwebsoft.common.system.service.DictService; +import com.gxwebsoft.common.system.service.DictDataService; import com.gxwebsoft.ai.config.KnowledgeBaseConfig; import com.gxwebsoft.ai.entity.AiCloudDoc; import com.gxwebsoft.ai.entity.AiCloudFile; @@ -53,6 +58,12 @@ public class OaCompanyServiceImpl extends ServiceImpl pageRel(OaCompanyParam param) { @@ -117,6 +128,25 @@ public class OaCompanyServiceImpl extends ServiceImpl().eq(Dict::getDictCode, "documentCategory")); + if (dict != null) { + // 根据dictId获取所有字典数据 + DictDataParam param = new DictDataParam(); + param.setDictId(dict.getDictId()); + List dictDataList = dictDataService.listRel(param); + // 提取dictDataCode作为目录名称 + directoryNames = dictDataList.stream() + .map(DictData::getDictDataCode) + .collect(Collectors.toList()); + } + } catch (Exception e) { + e.printStackTrace(); + // 如果获取字典数据失败,使用默认列表 + } + List directories = new ArrayList<>(); for (int i = 0; i < directoryNames.size(); i++) { AiCloudDoc doc = new AiCloudDoc();