Browse Source

修改bug

lvzhikai 4 years ago
parent
commit
fcff57cb6d

+ 4 - 3
src/main/java/com/chinaitop/depot/agent/basic/mapper/BusinessAgentStorehouseMapper.xml

@@ -293,7 +293,7 @@
293 293
     bstore.storehouse_type storehouseType,
294 294
     bstore.design_capacity designCapacity,
295 295
     bstore.actual_capacity actualCapacity,
296
-    keepers.name dutystoreman,
296
+    group_concat(keepers. NAME) dutystoreman,
297 297
     bstore.storehouse_state storehouseState,
298 298
     bstore.del_flag delFlag,
299 299
     bstore.usedate,
@@ -301,13 +301,14 @@
301 301
     FROM
302 302
     business_agent_storehouse store
303 303
     LEFT JOIN basic_storehouse bstore ON store.storehouse_id = bstore.storehouse_id
304
-    LEFT JOIN basic_keeper_house keeper ON keeper.house_Id = bstore.storehouse_id	AND keeper.org_id = #{orgId,jdbcType=VARCHAR}
305
-    LEFT JOIN basic_keeper keepers ON keepers.id = keeper.keeper_Id	AND keepers.org_id = #{orgId,jdbcType=VARCHAR}
304
+    LEFT JOIN basic_keeper_house keeper ON keeper.house_Id = bstore.storehouse_id
305
+    LEFT JOIN basic_keeper keepers ON keepers.id = keeper.keeper_Id
306 306
     WHERE
307 307
     bstore.del_flag = 1 AND store.del_flag = 1 AND store.org_id = #{orgId,jdbcType=VARCHAR}
308 308
     <if test="agentDepotName != null">
309 309
       AND bstore.depot_name LIKE #{agentDepotName,jdbcType=VARCHAR}
310 310
     </if>
311
+    GROUP BY store.storehouse_id
311 312
   </select>
312 313
   <select id="getAgentStoreInfo" resultType="java.util.Map" parameterType="java.util.Map">
313 314
     SELECT