|
@@ -14,7 +14,7 @@
|
|
and m.delete_flag = '0'
|
|
and m.delete_flag = '0'
|
|
<if test="searchType != null and searchType != ''">
|
|
<if test="searchType != null and searchType != ''">
|
|
<if test="searchType == 1">
|
|
<if test="searchType == 1">
|
|
- AND m.status_flag != '3'
|
|
|
|
|
|
+ AND (m.status_flag != '3' or approve_status='待决策人审核')
|
|
</if>
|
|
</if>
|
|
<if test="searchType == 2">
|
|
<if test="searchType == 2">
|
|
AND m.status_flag = '3'
|
|
AND m.status_flag = '3'
|
|
@@ -77,7 +77,7 @@
|
|
and m.delete_flag = '0'
|
|
and m.delete_flag = '0'
|
|
<if test="searchType != null and searchType != ''">
|
|
<if test="searchType != null and searchType != ''">
|
|
<if test="searchType == 1">
|
|
<if test="searchType == 1">
|
|
- AND m.status_flag != '3'
|
|
|
|
|
|
+ AND (m.status_flag != '3' or approve_status='待决策人审核')
|
|
</if>
|
|
</if>
|
|
<if test="searchType == 2">
|
|
<if test="searchType == 2">
|
|
AND m.status_flag = '3'
|
|
AND m.status_flag = '3'
|