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

amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificMapper.xml

@@ -1526,18 +1526,22 @@
     </select>
     <select id="queryCompanyStaData" resultType="java.util.Map">
         SELECT
-        s.biz_org_code as bizOrgCode,
-        c.code as categoryCode,
-        count(1) as total
+            s.biz_org_code AS bizOrgCode,
+            c.`code` AS categoryCode,
+            count( 1 ) AS total
         FROM
-        `wl_equipment_specific` s,
-        wl_equipment e,
-        wl_equipment_category c
-        where
-        s.equipment_code = e.`code`
-        and e.category_id = c.id
-        and s.biz_org_code <![CDATA[<>]]> ''
-        GROUP BY s.biz_org_code ,c.code
+            `wl_equipment_specific` s
+                LEFT JOIN wl_equipment_detail ed ON ed.id = s.equipment_detail_id
+                LEFT JOIN wl_equipment e ON e.id = ed.equipment_id
+                LEFT JOIN wl_equipment_category c ON c.id = e.category_id
+        WHERE
+            s.biz_org_code != ''
+	        AND s.biz_org_code IS NOT NULL
+	        AND c.`code` IS NOT NULL
+	        AND c.`code` != ''
+        GROUP BY
+            s.biz_org_code,
+            c.`code`
     </select>
 
     <select id="getEquipmentBySpecificId" resultType="String">