|
@@ -59,12 +59,12 @@
|
|
|
<if test="item.endTime != null and item.endTime != ''">
|
|
|
and wf.create_time <![CDATA[<= ]]> #{item.endTime}
|
|
|
</if>
|
|
|
- <if test="item.fieldName!=null or item.beginTime != null or item.endTime!=null">
|
|
|
+ <if test="item.fieldName!=null or item.beginTime != null or item.endTime!=null or item.companyName != null or item.provinceId != null ">
|
|
|
and
|
|
|
wf.field_code in (select code_number from sys_organization_auth where role_id =#{item.roleId} and code_type
|
|
|
= 'field')
|
|
|
</if>
|
|
|
- <if test="item.fieldName == null and item.beginTime == null and item.beginTime == null">
|
|
|
+ <if test="item.fieldName == null and item.beginTime == null and item.beginTime == null and item.companyName == null and item.provinceId == null ">
|
|
|
and
|
|
|
wf.create_by = #{item.userId}
|
|
|
or
|