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<Long> ids = applicationDOPageResult.stream().map(applicationDO -> Long.parseLong(applicationDO.getCreator())).collect(Collectors.toList());
         Map<Long, AdminUserRespDTO> 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<LabelDO> wrapper = new LambdaQueryWrapper<LabelDO>()
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<PromptTemplatesRespVO> pageRespList = BeanUtils.toBean(pageDoList, PromptTemplatesRespVO.class);
         List<PromptTemplatesRespVO> templatesRespList = pageRespList.getList();
 
+        if (CollectionUtils.isEmpty(templatesRespList)){
+            return pageRespList;
+        }
         for (PromptTemplatesRespVO respVO : templatesRespList) {
             try {
                 // 标签