|
|
@@ -14,6 +14,9 @@
|
|
|
<if test="dto.assessmentTemplateName != null and dto.assessmentTemplateName != ''">
|
|
|
and t2.name like concat('%', #{dto.assessmentTemplateName}, '%')
|
|
|
</if>
|
|
|
+ <if test="dto.keyword != null and dto.keyword != ''">
|
|
|
+ and (t2.name like concat('%', #{dto.keyword}, '%') or t1.name like concat('%', #{dto.keyword}, '%'))
|
|
|
+ </if>
|
|
|
<if test="dto.assessmentTemplateId != null">
|
|
|
and t2.id = #{dto.assessmentTemplateId}
|
|
|
</if>
|
|
|
@@ -35,6 +38,9 @@
|
|
|
<if test="dto.assessmentTemplateName != null and dto.assessmentTemplateName != ''">
|
|
|
and t2.name like concat('%', #{dto.assessmentTemplateName}, '%')
|
|
|
</if>
|
|
|
+ <if test="dto.keyword != null and dto.keyword != ''">
|
|
|
+ and (t2.name like concat('%', #{dto.keyword}, '%') or t1.name like concat('%', #{dto.keyword}, '%'))
|
|
|
+ </if>
|
|
|
<if test="dto.assessmentTemplateId != null">
|
|
|
and t2.id = #{dto.assessmentTemplateId}
|
|
|
</if>
|
|
|
@@ -65,6 +71,9 @@
|
|
|
<if test="dto.assessmentTemplateName != null and dto.assessmentTemplateName != ''">
|
|
|
and t2.name like concat('%', #{dto.assessmentTemplateName}, '%')
|
|
|
</if>
|
|
|
+ <if test="dto.keyword != null and dto.keyword != ''">
|
|
|
+ and (t2.name like concat('%', #{dto.keyword}, '%') or t1.name like concat('%', #{dto.keyword}, '%'))
|
|
|
+ </if>
|
|
|
<if test="dto.assessmentTemplateId != null">
|
|
|
and t2.id = #{dto.assessmentTemplateId}
|
|
|
</if>
|