Merge branch 'master' of http://git.minpay.cc/SupplyChain/service

sc-service/src/main/resources/mapper/company/OwnCompanyManageMapper.xml

@@ -220,7 +220,7 @@
         <if test="paramMap.scyStatus != null and paramMap.scyStatus != '' and paramMap.scyStatus != '02' ">
             AND s.scy_status = #{paramMap.scyStatus}
         </if>
-        <if test="paramMap.scyStatus == null and paramMap.scyStatus == '' ">
+        <if test="paramMap.scyStatus == null or paramMap.scyStatus == '' ">
             AND s.scy_status != '99'
         </if>
         ORDER BY s.create_time DESC
@@ -286,7 +286,7 @@
         <if test="paramMap.scyStatus != null and paramMap.scyStatus != '' and paramMap.scyStatus != '02' ">
             AND s.scy_status = #{paramMap.scyStatus}
         </if>
-        <if test="paramMap.scyStatus == null and paramMap.scyStatus == '' ">
+        <if test="paramMap.scyStatus == null or paramMap.scyStatus == '' ">
             AND s.scy_status != '99'
         </if>
         ORDER BY s.create_time DESC