|
|
@@ -92,8 +92,7 @@
|
|
|
from kws_enterprise a
|
|
|
left join kws_user k on a.create_by = k.id
|
|
|
left join kws_user ku on a.update_by = ku.id
|
|
|
- left join kws_ent_type b
|
|
|
- on a.id = b.ent_id
|
|
|
+ left join kws_ent_type b on a.id = b.ent_id
|
|
|
<if test="dto.typeList != null and dto.typeList.size() > 0">and b.type in
|
|
|
<foreach collection="dto.typeList" item="item" open="(" close=")" separator=",">
|
|
|
#{item}
|
|
|
@@ -104,6 +103,9 @@
|
|
|
<if test="dto.approval != null">
|
|
|
and a.approval = #{dto.approval}
|
|
|
</if>
|
|
|
+ <if test="dto.entId != null">
|
|
|
+ and a.id = #{dto.entId}
|
|
|
+ </if>
|
|
|
<if test="dto.keywords != null">
|
|
|
and (a.contacts like concat('%', #{dto.keywords}, '%') or a.phone like concat('%', #{dto.keywords}, '%') or a.firm_name like concat('%', #{dto.keywords}, '%'))
|
|
|
</if>
|