From 3f4facffba2b6982d46668e33b9f1eafdc0e228f Mon Sep 17 00:00:00 2001 From: "jiakun.lin" Date: Thu, 11 Mar 2021 16:53:42 +0800 Subject: [PATCH] =?UTF-8?q?=E8=99=9A=E4=BB=BF=E5=AE=9E=E9=AA=8C=E6=95=99?= =?UTF-8?q?=E5=AD=A6=E5=AE=9E=E9=AA=8C=E5=AF=BC=E5=87=BAbug=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mapper/tms/ProjectRecordDao.xml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/resources/mapper/tms/ProjectRecordDao.xml b/src/main/resources/mapper/tms/ProjectRecordDao.xml index f327ea5..8495e51 100644 --- a/src/main/resources/mapper/tms/ProjectRecordDao.xml +++ b/src/main/resources/mapper/tms/ProjectRecordDao.xml @@ -107,8 +107,9 @@ FROM tms_project_record tpr LEFT JOIN hr_project_management tp ON tpr.projectId = tp.projectId LEFT JOIN tms_experimental_teaching tet ON tpr.projectId = tet.project_id + LEFT JOIN tms_experimental_report ter ON ter.projectId = tet.id WHERE tpr.userId = #{userid} - AND tpr.isdel = #{isdel} + AND ter.eventId = tpr.recordId AND tpr.projectId = tet.project_id AND tp.projectPermissions != 0 ORDER BY @@ -185,8 +186,10 @@ recordState FROM tms_project_record tpr LEFT JOIN hr_project_management tp ON tpr.projectId = tp.projectId + LEFT JOIN tms_experimental_report re ON re.eventId = tpr.recordId WHERE tpr.userId = #{userid} - AND tpr.isdel = #{isdel} +-- 注释掉报错，>=表示是否删除都导出 + AND tpr.isdel >= #{isdel} AND tp.projectPermissions = 0