From 1880e5aa4ad0b25a4a9ba0c1cf4de5d7c1005f3a Mon Sep 17 00:00:00 2001 From: Liuyang <2746366019@qq.com> Date: Fri, 24 Jan 2025 14:11:59 +0800 Subject: [PATCH] =?UTF-8?q?[update]=20=E5=BA=94=E7=94=A8=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=A4=A7=E6=A8=A1=E5=9E=8B=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E3=80=81=E6=A8=A1=E5=9E=8B=E6=8E=A8=E7=90=86?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/application/ApplicationServiceImpl.java | 12 ++++++++++-- .../prompttemplates/PromptTemplatesServiceImpl.java | 3 +++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/application/ApplicationServiceImpl.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/application/ApplicationServiceImpl.java index 68aeeb85b..d26bb923b 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/application/ApplicationServiceImpl.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/application/ApplicationServiceImpl.java @@ -230,7 +230,11 @@ public class ApplicationServiceImpl implements ApplicationService { return result; } for (ApplicationRespVO applicationRespVO : list) { - applicationRespVO.setCreatorName(userMap.get(Long.parseLong(applicationRespVO.getCreator())).getNickname()); + String creator = applicationRespVO.getCreator(); + AdminUserRespDTO userRespDTO = userMap.get(Long.parseLong(creator)); + if (userRespDTO != null){ + applicationRespVO.setCreatorName(userRespDTO.getNickname()); + } } return result; } @@ -264,7 +268,11 @@ public class ApplicationServiceImpl implements ApplicationService { List ids = applicationDOPageResult.stream().map(applicationDO -> Long.parseLong(applicationDO.getCreator())).collect(Collectors.toList()); Map userMap = adminUserApi.getUserMapApplication(ids); for (ApplicationRespVO applicationRespVO : result) { - applicationRespVO.setCreatorName(userMap.get(Long.parseLong(applicationRespVO.getCreator())).getNickname()); + String creator = applicationRespVO.getCreator(); + AdminUserRespDTO userRespDTO = userMap.get(Long.parseLong(creator)); + if (userRespDTO != null){ + applicationRespVO.setCreatorName(userRespDTO.getNickname()); + } if (applicationRespVO.getAppLabel() != null && !applicationRespVO.getAppLabel().equals("")) { String[] split = applicationRespVO.getAppLabel().split(","); LambdaQueryWrapper wrapper = new LambdaQueryWrapper() diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/prompttemplates/PromptTemplatesServiceImpl.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/prompttemplates/PromptTemplatesServiceImpl.java index 2810cd63b..dbf4fcbeb 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/prompttemplates/PromptTemplatesServiceImpl.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/prompttemplates/PromptTemplatesServiceImpl.java @@ -383,6 +383,9 @@ public class PromptTemplatesServiceImpl implements PromptTemplatesService { PageResult pageRespList = BeanUtils.toBean(pageDoList, PromptTemplatesRespVO.class); List templatesRespList = pageRespList.getList(); + if (CollectionUtils.isEmpty(templatesRespList)){ + return pageRespList; + } for (PromptTemplatesRespVO respVO : templatesRespList) { try { // 标签