From 1a2e22a27627b40689257442cc5a46598c634f8e Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 23 五月 2025 14:16:28 +0800
Subject: [PATCH] 测评接口完成,添加数据权限

---
 ruoyi-system/src/main/resources/mapper/system/TProjectApprovalReportMapper.xml |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/system/TProjectApprovalReportMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TProjectApprovalReportMapper.xml
index 4916193..124b004 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TProjectApprovalReportMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TProjectApprovalReportMapper.xml
@@ -25,7 +25,9 @@
         id, team_id, report_code, report_name, report_text, status, audit_person_id, audit_time, audit_remark, create_time, update_time, create_by, update_by, disabled
     </sql>
     <select id="pageList" resultType="com.ruoyi.system.vo.TProjectApprovalReportVO">
-        select id, team_id, report_code, report_name, report_text, status, audit_person_id, audit_time, audit_remark, create_time, update_time, create_by, update_by, disabled
+        select tpar.id, tpar.team_id, tpar.report_code, tpar.report_name, tpar.report_text, tpar.status, tpar.audit_person_id,
+        tpar.audit_time, tpar.audit_remark, tpar.create_time, tpar.update_time, tpar.create_by, tpar.update_by, tpar.disabled,
+        tpt.team_name as teamName
         from t_project_approval_report tpar
         left join t_project_team tpt on tpt.id = tpar.team_id
         <where>
@@ -44,7 +46,7 @@
             <if test="query.reportName != null and query.reportName != ''">
                 and tpar.report_name like concat('%',#{query.reportName},'%')
             </if>
-            <if test="query.status != null and query.status != -1">
+            <if test="query.status != null">
                 and tpar.status = #{query.status}
             </if>
             <if test="query.status == null">

--
Gitblit v1.7.1