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

hx-sale/src/main/resources/mapper/contract/ContractMapper.xml

@@ -170,12 +170,10 @@
     </select>
 
     <select id="customSalesStatistics" resultType="com.fjhx.sale.entity.contract.dto.ContractDto">
-        SELECT
-            sum(cc.amount) amount,
-            bc.name corporationName
-        FROM
-            contract cc
-                LEFT JOIN bytesailing_customer.customer bc ON cc.buy_corporation_id = bc.id
+        SELECT ifnull(sum(cc.amount), 0) amount,
+               bc.name                   corporationName
+        FROM contract cc
+                 LEFT JOIN bytesailing_customer.customer bc ON cc.buy_corporation_id = bc.id
             ${ew.customSqlSegment}
     </select>