|
@@ -245,7 +245,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
LEFT JOIN v_tenant_company c ON c.company_id = n.company_id
|
|
LEFT JOIN v_tenant_company c ON c.company_id = n.company_id
|
|
|
where 1=1
|
|
where 1=1
|
|
|
<if test="job !=null">
|
|
<if test="job !=null">
|
|
|
- and n.job = #{job}
|
|
|
|
|
|
|
+ and n.job like concat('%',#{job},'%')
|
|
|
</if>
|
|
</if>
|
|
|
<if test="workStart !=null and workEnd !=null and workEnd != '' and workStart!=''">
|
|
<if test="workStart !=null and workEnd !=null and workEnd != '' and workStart!=''">
|
|
|
and (SELECT DATE_FORMAT(NOW(), '%Y') as `year`)-r.start_year BETWEEN #{workStart} and #{workEnd}
|
|
and (SELECT DATE_FORMAT(NOW(), '%Y') as `year`)-r.start_year BETWEEN #{workStart} and #{workEnd}
|