From ada15aaecffa8795304a6eab07a372375b519c9a Mon Sep 17 00:00:00 2001
From: 钟日健 <5689795+arsn@user.noreply.gitee.com>
Date: Sun, 26 Sep 2021 22:54:06 +0800
Subject: [PATCH] 保安员导入修改,培训报名查询接口修改
---
src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.xml | 7 +++++--
1 files changed, 5 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 1d28907..2dc0abf 100644
--- a/src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.xml
+++ b/src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.xml
@@ -42,6 +42,9 @@
<if test="trainingRegistration.userId!=null and trainingRegistration.userId!=''">
and sr.user_id = #{trainingRegistration.userId}
</if>
+ <if test="trainingRegistration.deptId!=null and trainingRegistration.deptId!=''">
+ and bu.dept_id = #{trainingRegistration.deptId}
+ </if>
<if test="trainingRegistration.auditStatus!=null and trainingRegistration.auditStatus!=0">
and sr.audit_status = #{trainingRegistration.auditStatus}
</if>
@@ -152,9 +155,9 @@
</select>
<!--查询已报名培训公司未关联考试的报名信息-->
- <select id="getTrainIds" resultType="java.lang.Long">
+ <select id="getTrainIds" resultType="org.springblade.modules.training.entity.TrainingRegistration">
SELECT
- sr.id
+ sr.id,sr.train_exam_id trainExamId
FROM
sys_training_registration sr
LEFT JOIN
--
Gitblit v1.9.3