peiguo hace 4 años
padre
commit
575bbdfbb6
Se han modificado 1 ficheros con 2 adiciones y 2 borrados
  1. 2 2
      whepi-web/src/main/resources/mapper/RbMapper.xml

+ 2 - 2
whepi-web/src/main/resources/mapper/RbMapper.xml

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