From 1a6c0a16e5d62857460ee35e1726ac3289d69ce1 Mon Sep 17 00:00:00 2001
From: sunxiqing <2240398334@qq.com>
Date: Fri, 3 Jan 2025 15:17:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=84=E4=BC=B0=E6=8A=A5?=
 =?UTF-8?q?=E5=91=8A=E6=9F=A5=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ModelAssessTaskAutoServiceImpl.java       | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelassesstaskauto/ModelAssessTaskAutoServiceImpl.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelassesstaskauto/ModelAssessTaskAutoServiceImpl.java
index f9674f6a2..4c23a6b44 100644
--- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelassesstaskauto/ModelAssessTaskAutoServiceImpl.java
+++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelassesstaskauto/ModelAssessTaskAutoServiceImpl.java
@@ -174,33 +174,39 @@ public class ModelAssessTaskAutoServiceImpl implements ModelAssessTaskAutoServic
             List<Long> serviceIds =  modelAssessTaskAutoDOPageResult.getList().stream().
                     filter(modelAssessTaskManualDO -> modelAssessTaskManualDO.getModelType() == 0)
                     .map(ModelAssessTaskAutoDO::getModelService).collect(Collectors.toList());
+            Map<Long, ModelServiceDO> longModelServiceDOMap = null;
+            if (!CollectionUtils.isEmpty(serviceIds)){
             LambdaQueryWrapper<ModelServiceDO> wrapper = new LambdaQueryWrapper<>();
             wrapper.in(ModelServiceDO::getId,serviceIds);
             List<ModelServiceDO> modelServiceDOS = modelServiceMapper.selectList(wrapper);
-            Map<Long, ModelServiceDO> longModelServiceDOMap = cn.iocoder.yudao.framework.common.util.collection.
+            longModelServiceDOMap = cn.iocoder.yudao.framework.common.util.collection.
                     CollectionUtils.convertMap(modelServiceDOS, ModelServiceDO::getId);
+            }
             // 人工模型获取校验
             List<Long> serviceForeseeIds =  modelAssessTaskAutoDOPageResult.getList().stream().
                     filter(modelAssessTaskManualDO -> modelAssessTaskManualDO.getModelType() == 1)
                     .map(ModelAssessTaskAutoDO::getModelService).collect(Collectors.toList());
-            List<BaseModelDO> baseModelDOS = baseModelMapper.selectList(new LambdaQueryWrapper<BaseModelDO>()
-                    .in(BaseModelDO::getId, serviceForeseeIds));
-            Map<Long, BaseModelDO> serviceForeseeMaps = cn.iocoder.yudao.framework.common.util.collection.
-                    CollectionUtils.convertMap(baseModelDOS, BaseModelDO::getId);
-            result.getList().stream().forEach(modelAssessTaskManualRespVO -> {
-                if (modelAssessTaskManualRespVO.getModelType() == 0){
+            Map<Long, BaseModelDO> serviceForeseeMaps = null;
+            if (!CollectionUtils.isEmpty(serviceForeseeIds)) {
+                List<BaseModelDO> baseModelDOS = baseModelMapper.selectList(new LambdaQueryWrapper<BaseModelDO>()
+                        .in(BaseModelDO::getId, serviceForeseeIds));
+                serviceForeseeMaps = cn.iocoder.yudao.framework.common.util.collection.
+                        CollectionUtils.convertMap(baseModelDOS, BaseModelDO::getId);
+            }
+            for (ModelAssessTaskAutoRespVO modelAssessTaskManualRespVO : result.getList()){
+                if (modelAssessTaskManualRespVO.getModelType() == 0 && longModelServiceDOMap != null){
                     ModelServiceDO modelServiceDO = longModelServiceDOMap.get(modelAssessTaskManualRespVO.getModelService());
                     if(modelServiceDO != null){
                         modelAssessTaskManualRespVO.setModelServiceName(modelServiceDO.getServiceName());
                     }
-                }else {
+                }else if (modelAssessTaskManualRespVO.getModelType() == 1 && serviceForeseeMaps != null){
                     BaseModelDO baseModelDO = serviceForeseeMaps.get(modelAssessTaskManualRespVO.getModelService());
                     if(baseModelDO != null){
                         modelAssessTaskManualRespVO.setModelServiceName(baseModelDO.getModelName());
                     }
                 }
 
-            });
+            }
         }
         return result;
     }