修改

src/main/java/com/chinaitop/depot/agent/basic/mapper/BusinessAgentStorehouseMapper.xml

@@ -269,13 +269,15 @@
     bstore.storehouse_type storehouseType,
     bstore.design_capacity designCapacity,
     bstore.actual_capacity actualCapacity,
-    bstore.dutystoreman,
+    group_concat(keepers. NAME) dutystoreman,
     bstore.storehouse_state storehouseState,
     bstore.del_flag delFlag,
     bstore.usedate,
     '0' viewState
     FROM
     basic_storehouse bstore
+    LEFT JOIN basic_keeper_house keeper ON keeper.house_Id = bstore.storehouse_id
+    LEFT JOIN basic_keeper keepers ON keepers.id = keeper.keeper_Id
     WHERE
     bstore.library_type = 1 AND bstore.del_flag = 1
     AND bstore.depot_id != bstore.org_id
@@ -283,6 +285,7 @@
     <if test="agentDepotName != null">
       AND bstore.depot_name LIKE #{agentDepotName,jdbcType=VARCHAR}
     </if>
+    GROUP BY bstore.storehouse_id
     UNION ALL
     SELECT
     bstore.storehouse_id storehouseId,