fix: 解决查询区域公司为空时报错问题

guzijian
1 parent fc5a7fb2
Showing 2 changed files with 17 additions and 15 deletions
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderServiceImpl.java
trash-garbage/src/main/resources/mapper/GarOrderMapper.xml
@@ -572,9 +572,8 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
         } else {
             comparator = Comparator.comparing(TransportationEnterpriseVo::getDistance);
         }
-
-        List<Long> enterpriseIds = list.stream().map(TransportationEnterprise::getId).collect(Collectors.toList());
         // 企业id为空说明没有公司
+        List<Long> enterpriseIds = list.stream().map(TransportationEnterprise::getId).collect(Collectors.toList());
         List<GarOrder> orderList = baseMapper.queryCleanNumberByEnterpriseIds(enterpriseIds, GlobalStatus.GarOrderStatus.SUCCESS_ORDER.getValue());
         List<GarOrderEvaluate> evaluateList = garOrderEvaluateService.queryEvaluateByEnterpriseIds(enterpriseIds, GlobalStatus.GarOrderStatus.EVALUATE_TYPE_COMPANY.getValue());
         Map<String, List<GarOrderEvaluate>> evaluateMap = new HashMap<>();
@@ -77,18 +77,19 @@
         </foreach>
     </update>
     <select id="queryCleanNumberByEnterpriseIds" resultType="com.trash.garbage.pojo.domain.GarOrder">
-
-        <if test="list != null and list.size() > 0">
         select gar_order_company_id, count(gar_order_company_id) as count
         from gar_order
         where gar_order_handler_status = #{status}
+        <if test="list == null or list.size() == 0">
+            and 1 = 0
+        </if>
+        <if test="list != null and list.size() > 0">
             and gar_order_company_id in
             <foreach collection="list" item="item" open="(" separator="," close=")">
                 #{item}
             </foreach>
-            group by gar_order_company_id
         </if>
-
+        group by gar_order_company_id
     </select>
     <select id="queryDriverOrderListByTelWithType" resultType="com.trash.garbage.pojo.vo.GarOrderDriverVo">
         SELECT
@@ -97,7 +98,7 @@
         `order`.gar_order_trash_type,`order`.gar_order_contact_tel,`order`.gar_order_company_id,`order`.gar_latitude,
         `order`.gar_order_company_name,`order`.gar_order_company_tel,`order`.gar_order_scan_handler_flag,
         `order`.gar_order_agreement_time,`order`.gar_remark,`order`.gar_handler_evaluate_flag,
---         `order`.gar_order_handler_status gar_order_status,
+        -- `order`.gar_order_handler_status gar_order_status,
         `handler`.gar_order_handler_status,`handler`.gar_cancel_flag,`handler`.gar_reason,`order`.gar_real_car_count
         FROM gar_order `order`
         INNER JOIN gar_order_match_handler `handler` ON `order`.gar_order_id = `handler`.gar_order_id
@@ -151,12 +152,12 @@
         `disposal`.gar_order_disposal_status,
         `order`.gar_real_car_count,
         (
-            CASE
-            `order`.gar_order_id
-            WHEN `order`.gar_order_id THEN
-            ( SELECT count(*) FROM gar_order_match_ask ask INNER JOIN gar_order ON `gar_order`.gar_order_id =
-            `ask`.gar_order_id WHERE `order`.gar_order_id = `gar_order`.gar_order_id )
-            END
+        CASE
+        `order`.gar_order_id
+        WHEN `order`.gar_order_id THEN
+        ( SELECT count(*) FROM gar_order_match_ask ask INNER JOIN gar_order ON `gar_order`.gar_order_id =
+        `ask`.gar_order_id WHERE `order`.gar_order_id = `gar_order`.gar_order_id )
+        END
         ) AS gar_now_car_count
         FROM
         gar_order `order`
@@ -219,11 +220,13 @@
     <select id="queryUnprocessedOrder" resultType="com.trash.garbage.pojo.domain.GarOrder">
         select *
         from gar_order
-        where gar_order.gar_order_handler_status = #{orderType} and gar_order.gar_time_out_flag = #{timeOutFlag} and gar_order.gar_cancel_flag = #{cancelFlag}
+        where gar_order.gar_order_handler_status = #{orderType}
+          and gar_order.gar_time_out_flag = #{timeOutFlag}
+          and gar_order.gar_cancel_flag = #{cancelFlag}
     </select>
     <select id="queryDriverOrderListByTelWithTypeCount" resultType="java.lang.Integer">
         SELECT
-            count(*)
+        count(*)
         FROM gar_order `order`
         INNER JOIN gar_order_match_handler `handler` ON `order`.gar_order_id = `handler`.gar_order_id
         <where>