结果空处理

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/SerchProject.java → siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/SearchProject.java

@@ -11,6 +11,6 @@ import java.util.List;
  * @date 2025-11-13
  */
 @Data
-public class SerchProject extends Project {
+public class SearchProject extends Project {
     private List<ProjectAttachmentInfo> attachmentInfoList;
 }

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/mapper/ProjectMapper.java

@@ -1,6 +1,7 @@
 package com.siwei.apply.mapper;
 
 import com.siwei.apply.domain.Project;
+import com.siwei.apply.domain.SearchProject;
 import com.siwei.apply.domain.res.ProjectNumRes;
 import com.siwei.apply.domain.vo.ProjectFilterVo;
 import com.siwei.apply.domain.vo.ProjectUpdateVo;
@@ -65,7 +66,7 @@ public interface ProjectMapper {
     /**
      * 获取检索的项目列表
      */
-    List<Project> getListSearch(ProjectFilterVo projectFilterVo);
+    List<SearchProject> getListSearch(ProjectFilterVo projectFilterVo);
 
     Integer getSearchCount(ProjectFilterVo projectFilterVo);
 

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/impl/ProjectImpl.java

@@ -287,7 +287,7 @@ public class ProjectImpl implements ProjectService {
             projectFilterVo.setKeyWords(keyWords);
         }
         //todo 这里后期可以进行优化，把查询出的项目id写入redis中，分页时候可以取缓存
-        List<Project> projects = projectMapper.getListSearch(projectFilterVo);
+        List<SearchProject> projects = projectMapper.getListSearch(projectFilterVo);
         Integer count = projectMapper.getSearchCount(projectFilterVo);
         //根据项目id查询所有流程id
         List<String> projectIdList = projects.stream().map(BaseId::getId).collect(Collectors.toList());

siwei-modules/siwei-apply/src/main/resources/mapper/ProjectMapper.xml

@@ -18,7 +18,7 @@
     </resultMap>
 
     <!-- 扩展映射：继承基础映射并添加特有字段 -->
-    <resultMap id="SearchProjectMap" type="com.siwei.apply.domain.SerchProject" extends="projectMap">
+    <resultMap id="SearchProjectMap" type="com.siwei.apply.domain.SearchProject" extends="projectMap">
         <result property="attachmentInfoList" column="attachmentInfoList" typeHandler="com.siwei.apply.handler.JsonTypeHandler"/>
     </resultMap>
 
@@ -217,16 +217,19 @@
             P."on_chain_num" AS onChainNum,
             P."creator_id" AS creatorId,
             COALESCE(
+                    jsonb_agg(
                     CASE
-                    WHEN A."id" IS NOT NULL AND A."node_id" IS NOT NULL AND A."file_name" IS NOT NULL AND A."file_path" IS NOT NULL THEN
-                    jsonb_agg(jsonb_build_object('id', A.id,
-                                                'nodeId', A.node_id,
-                                                'fileName', A.file_name,
-                                                'filePath', A.file_path)
+                    WHEN A."id" IS NOT NULL
+                    AND A."node_id" IS NOT NULL
+                    AND A."file_name" IS NOT NULL
+                    AND A."file_path" IS NOT NULL THEN
+                    jsonb_build_object('id', A.id,
+                                    'nodeId', A.node_id,
+                                    'fileName', A.file_name,
+                                    'filePath', A.file_path)
                     ELSE NULL
                     END
-                    ),
-                    '[]'  -- 确保返回空数组而不是 null
+                    ),'[]'  -- 确保返回空数组而不是 null
             ) AS attachmentInfoList
         FROM
             public.t_project P