|
@@ -88,7 +88,7 @@
|
|
|
AND wa.project_id = #{project.id}
|
|
|
</if>
|
|
|
<if test="project != null and project.projectName != null and project.projectName != ''">
|
|
|
- AND p.project_name like concat('%',#{project.projectName},'%')
|
|
|
+ AND (p.project_name like concat('%',#{project.projectName},'%') or wa.reimburse_remarks like concat('%',#{project.projectName},'%'))
|
|
|
</if>
|
|
|
<if test="status != '' and status != null">
|
|
|
AND a.status = #{status}
|
|
@@ -175,7 +175,7 @@
|
|
|
AND wa.project_id = #{project.id}
|
|
|
</if>
|
|
|
<if test="project != null and project.projectName != null and project.projectName != ''">
|
|
|
- AND p.project_name like concat('%',#{project.projectName},'%')
|
|
|
+ AND (p.project_name like concat('%',#{project.projectName},'%') or wa.reimburse_remarks like concat('%',#{project.projectName},'%'))
|
|
|
</if>
|
|
|
<if test="status != '' and status != null">
|
|
|
AND a.status = #{status}
|