diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/datarefluxconfig/DataRefluxConfigController.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/datarefluxconfig/DataRefluxConfigController.java index 2b57cbd63..bc16663b8 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/datarefluxconfig/DataRefluxConfigController.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/datarefluxconfig/DataRefluxConfigController.java @@ -1,7 +1,9 @@ package cn.iocoder.yudao.module.llm.controller.admin.datarefluxconfig; import cn.iocoder.yudao.module.llm.controller.admin.datarefluxdata.vo.DataRefluxDataRespVO; +import cn.iocoder.yudao.module.llm.dal.dataobject.basemodel.BaseModelDO; import cn.iocoder.yudao.module.llm.dal.dataobject.datarefluxdata.DataRefluxDataDO; +import cn.iocoder.yudao.module.llm.dal.dataobject.modelservice.ModelServiceDO; import cn.iocoder.yudao.module.llm.dal.mysql.modelservice.ModelServiceMapper; import cn.iocoder.yudao.module.llm.service.basemodel.BaseModelService; import cn.iocoder.yudao.module.llm.service.datarefluxdata.DataRefluxDataService; @@ -82,9 +84,17 @@ public class DataRefluxConfigController { DataRefluxConfigDO dataRefluxConfig = dataRefluxConfigService.getDataRefluxConfig(id); DataRefluxConfigRespVO bean = BeanUtils.toBean(dataRefluxConfig, DataRefluxConfigRespVO.class); if (bean.getModelType()==0){ - bean.setModelServiceName(modelServiceService.getModelService(bean.getModelServiceId()).getServiceName()); + ModelServiceDO modelService = modelServiceService.getModelService(bean.getModelServiceId()); + if (modelService==null){ + bean.setModelServiceName(""); + } + bean.setModelServiceName(modelService.getServiceName()); }else if (bean.getModelType()==1){ - bean.setModelServiceName(baseModelService.getBaseModel(bean.getModelServiceId()).getModelName()); + BaseModelDO baseModel = baseModelService.getBaseModel(bean.getModelServiceId()); + if (baseModel==null){ + bean.setModelServiceName(""); + } + bean.setModelServiceName(baseModel.getModelName()); } return success(bean); } @@ -100,9 +110,17 @@ public class DataRefluxConfigController { PageResult bean = BeanUtils.toBean(pageResult, DataRefluxConfigRespVO.class); for (DataRefluxConfigRespVO dataRefluxConfigRespVO : bean.getList()){ if (dataRefluxConfigRespVO.getModelType()==0){ - dataRefluxConfigRespVO.setModelServiceName(modelServiceService.getModelService(dataRefluxConfigRespVO.getModelServiceId()).getServiceName()); + ModelServiceDO modelService = modelServiceService.getModelService(dataRefluxConfigRespVO.getModelServiceId()); + if (modelService==null){ + dataRefluxConfigRespVO.setModelServiceName(""); + } + dataRefluxConfigRespVO.setModelServiceName(modelService.getServiceName()); }else if (dataRefluxConfigRespVO.getModelType()==1){ - dataRefluxConfigRespVO.setModelServiceName(baseModelService.getBaseModel(dataRefluxConfigRespVO.getModelServiceId()).getModelName()); + BaseModelDO baseModel = baseModelService.getBaseModel(dataRefluxConfigRespVO.getModelServiceId()); + if (baseModel==null){ + dataRefluxConfigRespVO.setModelServiceName(""); + } + dataRefluxConfigRespVO.setModelServiceName(baseModel.getModelName()); } } // PageResult result = bean.setList(bean.getList());