Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0
This commit is contained in:
commit
b9f9a2d125
@ -182,6 +182,7 @@
|
|||||||
and approval_staff_id = #{approvalStaffId}
|
and approval_staff_id = #{approvalStaffId}
|
||||||
and f.status = 1
|
and f.status = 1
|
||||||
and f.flow_process != 2
|
and f.flow_process != 2
|
||||||
|
and r.start_id != 0
|
||||||
order by f.gmt_modified desc
|
order by f.gmt_modified desc
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
@ -193,6 +194,7 @@
|
|||||||
and approval_staff_id = #{approvalStaffId}
|
and approval_staff_id = #{approvalStaffId}
|
||||||
and f.status = 2
|
and f.status = 2
|
||||||
and f.flow_process != 2
|
and f.flow_process != 2
|
||||||
|
and r.start_id != 0
|
||||||
order by f.gmt_modified desc
|
order by f.gmt_modified desc
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user