123

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehiclePublishReceiveBiz.java

@@ -115,8 +115,8 @@ public class VehiclePublishReceiveBiz extends BaseBiz<VehiclePublishReceiveMappe
         }
         publishReceiveDTO.setVehiclePublish(vehiclePublish);
         Integer type = vehiclePublish.getType() == null ? 0 : vehiclePublish.getType();
+        setVehiclePublishReceive(publishReceiveDTO,receiveIdStr);
         List<VehiclePublishReceiveVo> receives = publishReceiveDTO.getReceiveVos();
-        setVehiclePublishReceive(receives,receiveIdStr);
         if (CollectionUtils.isNotEmpty(receives)){
             for (VehiclePublishReceiveVo vehiclePublishReceive : receives){
                 Integer id = vehiclePublishReceive.getId() == null ? 0 : vehiclePublishReceive.getId();
@@ -169,17 +169,19 @@ public class VehiclePublishReceiveBiz extends BaseBiz<VehiclePublishReceiveMappe
         return  publishReceiveDTO;
     }
 
-    public  void  setVehiclePublishReceive(List<VehiclePublishReceiveVo> receives,String receiveIds){
-        if (receives == null || receives.size() == 0){
-            receives = new ArrayList<>();
+    public  void   setVehiclePublishReceive(VehiclePublishReceiveDTO publishReceiveDTO,String receiveIds){
+        if (CollectionUtils.isEmpty(publishReceiveDTO.getReceiveVos())){
             if(StringUtils.isNotBlank(receiveIds)){
+                List<VehiclePublishReceiveVo>  receives = new ArrayList<>();
                 List<Integer> receiveIdList =Arrays.asList(receiveIds.split(",")).parallelStream().map(s -> Integer.valueOf(s)).collect(Collectors.toList());
                 for (Integer id : receiveIdList){
                     VehiclePublishReceiveVo vehiclePublishReceive  = new VehiclePublishReceiveVo();
                     vehiclePublishReceive.setId(id);
                     receives.add(vehiclePublishReceive);
                 }
+                publishReceiveDTO.setReceiveVos(receives);
             }
+
         }
     }