From 480e9090726a36a3766f0a00a2a94ae5a8f5e2aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=AF=E8=BE=89?= <francis_fh@163.com>
Date: Tue, 7 Jul 2026 21:20:15 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A3=8E=E9=87=87=E5=A2=9E=E5=8A=A0=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E5=8A=9F=E8=83=BD=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/app/FileMapper.xml  | 21 ++++++++++++++-----
 .../ruoyi/common/core/domain/entity/File.java | 14 +++++++++++++
 sql/migration_showcase_review.sql             |  5 ++++-
 3 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/ruoyi-bussiness/src/main/resources/mapper/app/FileMapper.xml b/ruoyi-bussiness/src/main/resources/mapper/app/FileMapper.xml
index 5da9d44..e0f0040 100644
--- a/ruoyi-bussiness/src/main/resources/mapper/app/FileMapper.xml
+++ b/ruoyi-bussiness/src/main/resources/mapper/app/FileMapper.xml
@@ -17,6 +17,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="reviewRemark"    column="review_remark"    />
         <result property="reviewBy"    column="review_by"    />
         <result property="reviewTime"    column="review_time"    />
+        <result property="userName"    column="user_name"    />
+        <result property="userType"    column="user_type"    />
+        <result property="userPhone"    column="user_phone"    />
     </resultMap>
 
     <sql id="selectFileVo">
@@ -67,12 +70,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectFileListForReview" parameterType="File" resultMap="FileResult">
-        <include refid="selectFileVo"/>
-        <where>  del_flag = '0'
-            <if test="bussinessid != null "> and bussinessid = #{bussinessid}</if>
-            <if test="reviewStatus != null and reviewStatus != ''"> and review_status = #{reviewStatus}</if>
+        select f.id, f.file_url, f.bussinessid, f.del_flag,
+               f.create_by, f.create_time, f.update_by, f.update_time,
+               f.review_status, f.review_remark, f.review_by, f.review_time,
+               u.name as user_name, u.is_company_user as user_type, u.phone as user_phone
+        from file f
+        left join app_user u on f.bussinessid = u.user_id
+        <where>
+            f.del_flag = '0'
+            <if test="reviewStatus != null and reviewStatus != ''"> and f.review_status = #{reviewStatus}</if>
+            <if test="userName != null and userName != ''"> and u.name like concat('%', #{userName}, '%')</if>
+            <if test="userType != null and userType != ''"> and u.is_company_user = #{userType}</if>
+            <if test="userPhone != null and userPhone != ''"> and u.phone like concat('%', #{userPhone}, '%')</if>
         </where>
-        order by create_time desc
+        order by f.create_time desc
     </select>
 
     <update id="updateIds">
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/File.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/File.java
index 62a1c42..bac1cf9 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/File.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/File.java
@@ -46,4 +46,18 @@ public class File extends BaseEntity
     @ApiModelProperty("审核时间")
     private String reviewTime;
 
+    /** --- 以下为 JOIN 查询 transient 字段，非 file 表列 --- */
+
+    @TableField(exist = false)
+    @ApiModelProperty("用户名称")
+    private String userName;
+
+    @TableField(exist = false)
+    @ApiModelProperty("用户类型（0企业 1求职者 2网格员 3政府人员）")
+    private String userType;
+
+    @TableField(exist = false)
+    @ApiModelProperty("用户手机号码")
+    private String userPhone;
+
 }
diff --git a/sql/migration_showcase_review.sql b/sql/migration_showcase_review.sql
index 60c4f48..54a2dd7 100644
--- a/sql/migration_showcase_review.sql
+++ b/sql/migration_showcase_review.sql
@@ -2,9 +2,12 @@
 -- 风采审核功能 — 数据库迁移
 -- 在 file 表新增审核相关字段
 -- 执行方式: 逐条执行以下 ALTER TABLE 语句
--- 注意: 当前库 file 表在 shz schema 下（由 currentSchema 决定），无需加 schema 前缀
 -- =============================================
 
+-- 先补上 file 表缺失的标准 RuoYi 字段（其他表都有，file 表漏了）
+ALTER TABLE "shz"."file" ADD COLUMN "remark" varchar(500) DEFAULT NULL;
+COMMENT ON COLUMN "shz"."file"."remark" IS '备注';
+
 ALTER TABLE "shz"."file" ADD COLUMN "review_status" char(1) DEFAULT '0';
 COMMENT ON COLUMN "shz"."file"."review_status" IS '审核状态：0-待审核,1-审核通过,2-审核未通过';