fix: BUG#23990 消防器材，点击查看器材详情，器材分类字段回显不正确

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

@@ -2941,7 +2941,7 @@
             IFNULL(IF(a.shbz_img IS NOT NULL, a.shbz_img, a.img), '') AS icon
         FROM
             wl_equipment_specific wes
-            LEFT JOIN (SELECT id, `code`, `name`, img, shbz_img, unit_id FROM wl_equipment WHERE LEFT(`code`, 1) IN (1, 3, 4, 5, 6, 7, 8)) a ON a.`code` = wes.equipment_code
+            LEFT JOIN (SELECT id, `code`, `name`, img, shbz_img, unit_id FROM wl_equipment WHERE LEFT(`code`, 1) IN (1, 3, 4, 5, 6, 7, 8, 9)) a ON a.`code` = wes.equipment_code
             LEFT JOIN wl_unit wu ON wu.id = a.unit_id
         WHERE
             a.`name` IS NOT NULL
@@ -2962,10 +2962,11 @@
             wes.equip_status AS equipStatus
         FROM
             wl_equipment_specific wes
-            LEFT JOIN (SELECT id, `code`, `name`, img, shbz_img, unit_id FROM wl_equipment WHERE LEFT(`code`, 1) IN (1, 3, 4, 5, 6, 7, 8)) a ON a.`code` = wes.equipment_code
+            LEFT JOIN (SELECT id, `code`, `name`, img, shbz_img, unit_id FROM wl_equipment WHERE LEFT(`code`, 1) IN (1, 3, 4, 5, 6, 7, 8, 9)) a ON a.`code` = wes.equipment_code
         <where>
+            a.name IS NOT NULL
             <if test="code != null and code != ''">
-                wes.equipment_code = #{code}
+                AND wes.equipment_code = #{code}
             </if>
             <if test="equipStatus != null and equipStatus != ''">
                 AND wes.equip_status = #{equipStatus}
@@ -2983,10 +2984,11 @@
             count(1)
         FROM
         wl_equipment_specific wes
-        LEFT JOIN (SELECT id, `code`, `name`, img, shbz_img, unit_id FROM wl_equipment WHERE LEFT(`code`, 1) IN (1, 3, 4, 5, 6, 7, 8)) a ON a.`code` = wes.equipment_code
+        LEFT JOIN (SELECT id, `code`, `name`, img, shbz_img, unit_id FROM wl_equipment WHERE LEFT(`code`, 1) IN (1, 3, 4, 5, 6, 7, 8, 9)) a ON a.`code` = wes.equipment_code
         <where>
+            a.name IS NOT NULL
             <if test="code != null and code != ''">
-                wes.equipment_code = #{code}
+                AND wes.equipment_code = #{code}
             </if>
             <if test="equipStatus != null and equipStatus != ''">
                 AND wes.equip_status = #{equipStatus}