Merge remote-tracking branch 'origin/dev' into dev

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/corps/mapper/CorpsDescMapper.xml

@@ -396,7 +396,7 @@
             AND o.customer_id IS NULL
         </if>
         <if test="CorpsDesc.notPurchased == null or CorpsDesc.notPurchased == ''">
-            AND o.customer_id IS NOT NULL
+            AND IFNULL(o.customer_id, 0 )  != 0
         </if>
         <if test="CorpsDesc.cname !=null and CorpsDesc.cname != ''">
             and pcd.cname like CONCAT(CONCAT('%', #{CorpsDesc.cname}), '%')