Merge remote-tracking branch 'origin/main'

src/main/java/org/energy/modules/spares/mapper/MaterialMapper.xml

@@ -38,18 +38,16 @@
     </select>
 
     <select id="getDetailList" resultType="org.energy.modules.spares.vo.MaterialVO">
-        select material_name, model
-             ,b.name as warehouse_name
-             ,inventory_count
-        from s_material
-        inner join (
-            select code
-            ,name
-            from spt_warehouse
-            where code in (select warehouse from s_material where material_no = #{materialNo} and is_deleted = 0)
-        ) as b
-        on b.code = s_material.warehouse
-        where material_no = #{materialNo} and is_deleted = 0
+        SELECT
+            a.material_name
+             , a.model
+             , b.name AS warehouse_name
+             , a.inventory_count
+        FROM s_material a
+        LEFT JOIN spt_warehouse b ON b.code = a.warehouse
+        WHERE
+            a.material_no = #{materialNo}
+          AND a.is_deleted = 0
     </select>
 
     <select id="exportData" resultType="org.energy.modules.spares.excel.MaterialExcel">

src/main/java/org/energy/modules/spares/mapper/WarehouseMapper.xml

@@ -54,7 +54,7 @@
     </select>
 
     <select id="getWarehouseList" resultMap="warehouseResultMap">
-        select id, code, name from spt_warehouse where is_deleted = 0
+        select id, code, name from spt_warehouse where is_deleted = 0 and approval_status = 2
     </select>
 
 </mapper>