diff --git a/ccdi-project/src/main/java/com/ruoyi/ccdi/project/service/impl/CcdiModelParamServiceImpl.java b/ccdi-project/src/main/java/com/ruoyi/ccdi/project/service/impl/CcdiModelParamServiceImpl.java index 6c2b865..0e7ee44 100644 --- a/ccdi-project/src/main/java/com/ruoyi/ccdi/project/service/impl/CcdiModelParamServiceImpl.java +++ b/ccdi-project/src/main/java/com/ruoyi/ccdi/project/service/impl/CcdiModelParamServiceImpl.java @@ -41,12 +41,31 @@ public class CcdiModelParamServiceImpl implements ICcdiModelParamService { @Override public List selectModelList(Long projectId) { + log.info("selectModelList 被调用,projectId={}", projectId); + if (projectId == null) { projectId = 0L; // 默认查询系统级参数 } + // 如果是项目查询(projectId > 0),需要根据 configType 决定查询哪组参数 + Long effectiveProjectId = projectId; + if (projectId > 0) { + // 查询项目信息 + CcdiProject project = projectMapper.selectById(projectId); + log.info("查询到项目信息: projectId={}, configType={}", projectId, + project != null ? project.getConfigType() : "null"); + + if (project != null && "default".equals(project.getConfigType())) { + // 使用系统默认参数 + effectiveProjectId = 0L; + log.info("项目使用默认配置,切换到系统默认参数,effectiveProjectId=0"); + } + } + + log.info("准备查询模型列表,effectiveProjectId={}", effectiveProjectId); List result = new ArrayList<>(); - List params = modelParamMapper.selectDistinctModels(projectId); + List params = modelParamMapper.selectDistinctModels(effectiveProjectId); + log.info("查询到 {} 个模型", params.size()); params.forEach(param -> { ModelListVO vo = new ModelListVO();