|
@@ -75,7 +75,7 @@
|
|
|
and (msr.report_status is null or msr.report_status=0)
|
|
|
</if>
|
|
|
<if test="msStatus == '1'.toString()">
|
|
|
- and msr.report_status is null
|
|
|
+ and (msr.report_status is null or msr.report_status=0)
|
|
|
</if>
|
|
|
<if test="msStatus == '2'.toString()">
|
|
|
and msr.report_status=1 and msr.ms_status=1
|
|
@@ -208,7 +208,7 @@
|
|
|
and (msr.report_status is null or msr.report_status=0)
|
|
|
</if>
|
|
|
<if test="msStatus == '1'.toString()">
|
|
|
- and msr.report_status is null
|
|
|
+ and (msr.report_status is null or msr.report_status=0)
|
|
|
</if>
|
|
|
<if test="msStatus == '2'.toString()">
|
|
|
and msr.report_status=1 and msr.ms_status=1
|