.

src/main/java/com/chinaitop/depot/supervise/mapper/DepotStyleMapper.xml

@@ -538,8 +538,13 @@
     select 
       b.storehouse_name||a.warehouse_name storehouse_name
     from basic_warehouse a 
-    left join basic_storehouse b on a.storehouse_id=a.storehouse_id
+    left join basic_storehouse b on a.storehouse_id=b.storehouse_id
     where a.crk_status='2' and a.org_id=#{orgId}
+    union all 
+    select 
+      storagetank_name storehouse_name
+    from basic_tank 
+    where crk_status='2' and org_id=#{orgId}
   </select>
     <select id="selectCK" parameterType="java.util.Map" resultType="java.util.HashMap">
         SELECT 
@@ -547,6 +552,11 @@
         FROM basic_warehouse ware
         LEFT JOIN basic_storehouse store ON ware.storehouse_id = store.storehouse_id
         WHERE ware.crk_status = '4' and store.org_id=#{orgId}
+        union all 
+        select 
+          storagetank_name storehouse_name
+        from basic_tank 
+        where crk_status='4' and org_id=#{orgId}
     </select>
     <select id="selectHouseState" parameterType="java.util.Map" resultType="java.util.HashMap">
         select * from (