From 8fec9579ae4adb4f7f53440933908c90eea33b20 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 19 二月 2025 15:35:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/resources/mapper/ProjectPlanExamineRecordMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/business/src/main/resources/mapper/ProjectPlanExamineRecordMapper.xml b/business/src/main/resources/mapper/ProjectPlanExamineRecordMapper.xml
index 379a5f0..0490ee3 100644
--- a/business/src/main/resources/mapper/ProjectPlanExamineRecordMapper.xml
+++ b/business/src/main/resources/mapper/ProjectPlanExamineRecordMapper.xml
@@ -179,7 +179,7 @@
FROM t_project_plan_examine_record AS pper
WHERE
pper.project_plan_record_id = #{projectPlanRecordId}
- AND pper.event_type = 0
+ AND pper.event_type != 2
AND pper.deleted = 0
ORDER BY gmt_update DESC
</select>
@@ -189,7 +189,7 @@
from t_project_plan_examine_record ppe
LEFT JOIN t_project_plan_info ppi on ppe.project_plan_info_id = ppi.id
LEFT JOIN t_project_plan_record ppr on ppe.project_plan_record_id = ppr.id
- LEFT JOIN t_project_info pi on ppr.project_info_id = pi.id
+ INNER JOIN t_project_info pi on ppr.project_info_id = pi.id AND pi.deleted = 0
WHERE ppe.department_user_id = #{userId} or manager_user_id = #{userId}
</select>
--
Gitblit v1.8.0