11

ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsFileController.java

@@ -34,7 +34,7 @@ public class CmsFileController extends BaseController {
     @GetMapping("/review/list")
     public TableDataInfo reviewList(File file) {
         startPage();
-        List<com.ruoyi.common.core.domain.vo.FileReviewVO> list = fileService.selectFileListForReview(file);
+        List<File> list = fileService.selectFileListForReview(file);
         return getDataTable(list);
     }
 

ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/FileMapper.java

@@ -2,7 +2,6 @@ package com.ruoyi.cms.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.common.core.domain.entity.File;
-import com.ruoyi.common.core.domain.vo.FileReviewVO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -31,5 +30,5 @@ public interface FileMapper extends BaseMapper<File>
     /**
      * 查询风采审核列表（后台管理用）
      */
-    public List<FileReviewVO> selectFileListForReview(File file);
+    public List<File> selectFileListForReview(File file);
 }

ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IFileService.java

@@ -2,7 +2,6 @@ package com.ruoyi.cms.service;
 
 import com.ruoyi.common.core.domain.entity.File;
 import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.vo.FileReviewVO;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
@@ -63,7 +62,7 @@ public interface IFileService
     /**
      * 查询风采审核列表（后台管理用）
      */
-    public List<FileReviewVO> selectFileListForReview(File file);
+    public List<File> selectFileListForReview(File file);
 
     /**
      * 审核风采文件

ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/FileServiceImpl.java

@@ -9,7 +9,6 @@ import java.util.Arrays;
 
 import com.ruoyi.cms.util.StringUtil;
 import com.ruoyi.common.core.domain.entity.File;
-import com.ruoyi.common.core.domain.vo.FileReviewVO;
 import com.ruoyi.cms.mapper.FileMapper;
 import com.ruoyi.cms.service.IFileService;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -175,7 +174,7 @@ public class FileServiceImpl extends ServiceImpl<FileMapper, File> implements IF
     }
 
     @Override
-    public List<FileReviewVO> selectFileListForReview(File file) {
+    public List<File> selectFileListForReview(File file) {
         return fileMapper.selectFileListForReview(file);
     }
 

ruoyi-bussiness/src/main/resources/mapper/app/FileMapper.xml

@@ -17,10 +17,6 @@ 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"    />
-    </resultMap>
-
-    <!-- 风采审核 VO 结果映射（继承 FileResult，追加 app_user JOIN 字段） -->
-    <resultMap type="com.ruoyi.common.core.domain.vo.FileReviewVO" id="FileReviewVOResult" extends="FileResult">
         <result property="userName"    column="user_name"    />
         <result property="userType"    column="user_type"    />
         <result property="userPhone"    column="user_phone"    />
@@ -73,7 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
-    <select id="selectFileListForReview" parameterType="File" resultMap="FileReviewVOResult">
+    <select id="selectFileListForReview" parameterType="File" resultMap="FileResult">
         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,

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 查询字段（非 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;
+
 }

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/vo/FileReviewVO.java

@@ -1,28 +0,0 @@
-package com.ruoyi.common.core.domain.vo;
-
-import com.ruoyi.common.core.domain.entity.File;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 风采审核列表 VO —— 扩展 File 实体，携带 JOIN app_user 的用户信息
- *
- * @author admin
- * @date 2026-07-07
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ApiModel("风采审核视图对象")
-public class FileReviewVO extends File {
-
-    @ApiModelProperty("用户名称")
-    private String userName;
-
-    @ApiModelProperty("用户类型（0企业 1求职者 2网格员 3政府人员）")
-    private String userType;
-
-    @ApiModelProperty("用户手机号码")
-    private String userPhone;
-}