Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/FreightReceivingDispatchingServiceImpl.java

@@ -289,10 +289,17 @@ public class FreightReceivingDispatchingServiceImpl extends ServiceImpl<FreightR
         FreightReceivingDispatching freightReceivingDispatching = this.selectById(id);
         // 查看详情
         List<FreightReceivingDispatchingCar> freightReceivingDispatchingCars = freightReceivingDispatchingCarService.selectList(new EntityWrapper<FreightReceivingDispatchingCar>()
-                .eq("batch", freightReceivingDispatching.getBatch()));
+                .eq("batch", freightReceivingDispatching.getBatch())
+                .eq("delete_flag","0"));
         if (!CollectionUtils.isEmpty(freightReceivingDispatchingCars)){
             freightReceivingDispatching.setFreightReceivingDispatchingCars(freightReceivingDispatchingCars);
         }
+        List<ReceivingUser> receivingUsers=receivingUserService.selectList(new EntityWrapper<ReceivingUser>()
+                .eq("info_id", id)
+                .eq("delete_flag","0"));
+        if (!CollectionUtils.isEmpty(receivingUsers)){
+            freightReceivingDispatching.setReceivingUsers(receivingUsers);
+        }
         return freightReceivingDispatching;
     }
 }