Merge remote-tracking branch 'origin/master'

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml

@@ -1062,21 +1062,30 @@
 
     <select id="getToDoNum3" resultType="java.lang.Integer">
         SELECT
-        count(a.sid) as count
+        count(DISTINCT a.sid) as count
         FROM
         as_busrepair_bill a
-        LEFT JOIN as_busrepair_bill_vech av ON a.sid = av.billSid
+        LEFT JOIN
-        LEFT JOIN as_busrepair_inventorybill ib ON a.sid = ib.sourceBillSid
+        as_busrepair_bill_vech av
-        LEFT JOIN as_busrepair_inventorybill_detail id ON ib.sid = id.billSid
+        ON a.sid = av.billSid
-        LEFT JOIN yxt_wms.wms_old_register wor ON a.billNo = wor.billNo
+        LEFT JOIN
-        LEFT JOIN anrui_portal.sys_organization AS s ON a.deptSid = s.sid
+        as_busrepair_inventorybill ib
+        ON a.sid = ib.sourceBillSid
+        LEFT JOIN
+        as_busrepair_inventorybill_detail id
+        ON ib.sid = id.billSid
+        LEFT JOIN
+        yxt_wms.wms_old_register wor
+        ON a.billNo = wor.billNo
+        LEFT JOIN
+        anrui_portal.sys_organization AS s
+        ON a.deptSid = s.sid
         <where>
             ${ew.sqlSegment}
             AND (a.nodeCode = 3 OR a.nodeCode = 5) AND (id.oldIsInInventory = 0 OR id.oldIsInInventory = '' OR
             id.oldIsInInventory IS NULL)
         </where>
-        GROUP BY
+
-        a.sid
     </select>