|
|
@@ -52,7 +52,7 @@
|
|
|
<if test="dto.endTime != null and dto.endTime != ''">
|
|
|
and t.end_time = #{dto.endTime}
|
|
|
</if>
|
|
|
- <if test="dto.credentialNumber != null and dto.endTime != ''">
|
|
|
+ <if test="dto.credentialNumber != null and dto.credentialNumber != ''">
|
|
|
and t5.credential_number = #{dto.credentialNumber}
|
|
|
</if>
|
|
|
<if test="dto.name != null and dto.name != ''">
|
|
|
@@ -90,7 +90,10 @@
|
|
|
<if test="dto.studentName != null and dto.studentName != ''">
|
|
|
and t1.name like concat('$',#{dto.studentName},'%')
|
|
|
</if>
|
|
|
- <if test="dto.credentialNumber != null and dto.endTime != ''">
|
|
|
+ <if test="dto.name != null and dto.name != ''">
|
|
|
+ and t1.name like concat('$',#{dto.name},'%')
|
|
|
+ </if>
|
|
|
+ <if test="dto.credentialNumber != null and dto.credential_number != ''">
|
|
|
and t3.credential_number = #{dto.credentialNumber}
|
|
|
</if>
|
|
|
</select>
|
