1

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

@@ -412,7 +412,7 @@
         house.storehouse_name storehousename,
         house.storehouse_type storehousetype,
         house.actual_capacity actualcapacity,
-        bk.name dutystoreman,
+        b.bgy dutystoreman,
 	    hw.sub_type subtype,
 	    hw.quality,
 	    hw.record_unite recordunite,
@@ -430,11 +430,15 @@
         '其它'
         END
         ) AS crkstate
-    FROM
-        basic_storehouse house
+    FROM basic_storehouse house
     LEFT JOIN storage_foodbasicinfo hw ON house.storehouse_id = hw.house_id
-    LEFT JOIN basic_keeper_house bkh ON bkh.house_Id = house.storehouse_id
-    LEFT JOIN basic_keeper bk ON bk.id = bkh.keeper_Id
+    left join (
+        select 
+		    a1.house_id, wm_concat(c1.real_name) bgy 
+		from basic_keeper_house a1 
+        left join user_info c1 on c1.user_id=a1.keeper_id
+        group by a1.house_id
+    ) b on b.house_id=house.storehouse_id
     LEFT JOIN basic_warehouse ware ON ware.storehouse_id = house.storehouse_id
     LEFT JOIN (
         SELECT