From b8f798ee5d7b5152df225ec1c82490ce894f0afe Mon Sep 17 00:00:00 2001
From: wkc <978997012@qq.com>
Date: Thu, 26 Feb 2026 17:15:14 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E9=A1=B9=E7=9B=AE=E5=88=86=E9=A1=B5?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=85=B3=E8=81=94sys=5Fuser=E8=A1=A8?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=88=9B=E5=BB=BA=E4=BA=BA=E7=9C=9F=E5=AE=9E?=
 =?UTF-8?q?=E5=A7=93=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- VO 添加 createByName 字段
- Mapper XML 添加 LEFT JOIN sys_user 查询
- 使用 IFNULL 处理空值降级
- 添加逻辑删除过滤条件
- 通过代码审查
---
 .../collection/domain/vo/CcdiProjectVO.java   |  5 ++++-
 .../info/collection/CcdiProjectMapper.xml     | 20 +++++++++++--------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/ccdi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/CcdiProjectVO.java b/ccdi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/CcdiProjectVO.java
index c9fc5a9..e246d0c 100644
--- a/ccdi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/CcdiProjectVO.java
+++ b/ccdi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/CcdiProjectVO.java
@@ -44,6 +44,9 @@ public class CcdiProjectVO {
     /** 创建时间 */
     private Date createTime;
 
-    /** 创建者 */
+    /** 创建者（用户名） */
     private String createBy;
+
+    /** 创建者姓名（真实姓名） */
+    private String createByName;
 }
diff --git a/ccdi-info-collection/src/main/resources/mapper/info/collection/CcdiProjectMapper.xml b/ccdi-info-collection/src/main/resources/mapper/info/collection/CcdiProjectMapper.xml
index 0e9cb45..2ea0131 100644
--- a/ccdi-info-collection/src/main/resources/mapper/info/collection/CcdiProjectMapper.xml
+++ b/ccdi-info-collection/src/main/resources/mapper/info/collection/CcdiProjectMapper.xml
@@ -15,24 +15,28 @@
         <result property="lowRiskCount" column="low_risk_count"/>
         <result property="createTime" column="create_time"/>
         <result property="createBy" column="create_by"/>
+        <result property="createByName" column="create_by_name"/>
     </resultMap>
 
     <!-- 分页查询项目列表 -->
     <select id="selectProjectPage" resultMap="ProjectVOResultMap">
         SELECT
-            project_id, project_name, description, config_type,
-            status, is_archived, target_count, high_risk_count,
-            medium_risk_count, low_risk_count, create_time, create_by
-        FROM ccdi_project
+            p.project_id, p.project_name, p.description, p.config_type,
+            p.status, p.is_archived, p.target_count, p.high_risk_count,
+            p.medium_risk_count, p.low_risk_count, p.create_time,
+            p.create_by,
+            IFNULL(u.nick_name, p.create_by) AS create_by_name
+        FROM ccdi_project p
+        LEFT JOIN sys_user u ON p.create_by = u.user_name AND u.del_flag = '0'
         <where>
-            del_flag = '0'
+            p.del_flag = '0'
             <if test="queryDTO.projectName != null and queryDTO.projectName != ''">
-                AND project_name LIKE CONCAT('%', #{queryDTO.projectName}, '%')
+                AND p.project_name LIKE CONCAT('%', #{queryDTO.projectName}, '%')
             </if>
             <if test="queryDTO.status != null and queryDTO.status != ''">
-                AND status = #{queryDTO.status}
+                AND p.status = #{queryDTO.status}
             </if>
         </where>
-        ORDER BY create_time DESC
+        ORDER BY p.create_time DESC
     </select>
 </mapper>