From 2b5ca6cea92ff6a67582c3331a0704480e63b9b4 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 02 Sep 2021 11:28:17 +0800
Subject: [PATCH] 1.正式考试，模拟考试考试申请接口修改 2.用户头像批量上传（压缩zip 包上传） 3.通知公告接口修改
---
src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.xml | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.xml b/src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.xml
index 821922c..d1867fb 100644
--- a/src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.xml
+++ b/src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.xml
@@ -50,7 +50,7 @@
and bu.real_name like concat('%', #{trainingRegistration.realName},'%')
</if>
<if test="trainingRegistration.cancel!=null">
- and sr.cancel = #{trainingRegistration.cancel}
+ and (sr.training_unit_id is null or ke.audit_status = 3)
</if>
</select>
@@ -154,11 +154,16 @@
blade_user bu
on
str.user_id = bu.id
+ left join
+ ksxt_exam ke
+ on
+ ke.id = str.train_exam_id
WHERE
1=1
and str.is_exam = 1
and str.cancel = 1
and bu.is_train = 1
- and str.train_exam_id is null
+ and (str.train_exam_id is null or ke.audit_status = 3)
+ limit 0,#{number}
</select>
</mapper>
--
Gitblit v1.9.3