From df0d7b7f96d134f9ce40d1bcd2a1bd296a2888a1 Mon Sep 17 00:00:00 2001
From: Yangk <yangk@menace.com>
Date: Wed, 11 Mar 2026 11:27:52 +0800
Subject: [PATCH] =?UTF-8?q?fix(oa):=20=E4=BF=AE=E5=A4=8D=E5=B7=A5=E6=97=B6?=
 =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91=EF=BC=8C?=
 =?UTF-8?q?=E6=8E=92=E9=99=A4=E9=A1=B9=E7=9B=AE=E7=B1=BB=E5=88=AB=E4=B8=BA?=
 =?UTF-8?q?'9'=E7=9A=84=E9=A1=B9=E7=9B=AE=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/oa/erp/ErpTimesheetReportMapper.xml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpTimesheetReportMapper.xml b/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpTimesheetReportMapper.xml
index 6d855779..986c7546 100644
--- a/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpTimesheetReportMapper.xml
+++ b/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpTimesheetReportMapper.xml
@@ -28,12 +28,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             LEFT JOIN sys_dept p_dept ON p.dept_id = p_dept.dept_id
             <!-- 关联全局统计 (独立子查询，不受主查询部门条件影响) -->
             LEFT JOIN (
-                SELECT 
-                    tp2.project_id, 
+                SELECT
+                    tp2.project_id,
                     SUM(tp2.hours) AS total_hours
                 FROM erp_timesheet_project tp2
                 JOIN erp_timesheet_info ti2 ON tp2.timesheet_id = ti2.timesheet_id AND ti2.del_flag = '0'
-                WHERE tp2.del_flag = '0' 
+                WHERE tp2.del_flag = '0'
                   AND ti2.timesheet_status = '3'
                   <if test="startTime != null and startTime != ''">
                       AND ti2.start_time >= #{startTime}
@@ -45,6 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             ) global_stats ON p.project_id = global_stats.project_id
         <where>
             p.del_flag = '0'
+            AND p.project_category <> '9'
             <if test="bo.projectName != null and bo.projectName != ''">
                 AND p.project_name LIKE concat('%', #{bo.projectName}, '%')
             </if>
@@ -91,6 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         JOIN sys_user u ON ti.user_id = u.user_id AND u.del_flag = '0'
         WHERE ti.timesheet_status = '3'
         AND tp.del_flag = '0'
+        AND p.project_category <> '9'
         <if test="deptId != null">
             AND ti.dept_id = #{deptId}
         </if>
@@ -112,6 +114,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         JOIN erp_timesheet_info ti ON tp.timesheet_id = ti.timesheet_id AND ti.del_flag = '0'
         WHERE ti.timesheet_status = '3'
         AND tp.del_flag = '0'
+        AND p.project_category <> '9'
         <if test="startTime != null and startTime != ''">
             AND ti.start_time >= #{startTime}
         </if>