Merge branch 'master-chw' into dev-chw

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

@@ -584,11 +584,16 @@ public class VehiclePublishReceiveBiz extends BaseBiz<VehiclePublishReceiveMappe
             for (Integer id : idList){
                 VehiclePublishFindDTO publishFindDTO = new VehiclePublishFindDTO();
                 publishFindDTO.setId(id);
-                List<ReceiveVo> list = getListByReceive(publishFindDTO);
-                if (list.size() > 0){
-                    ReceiveVo receiveVo = list.get(0);
+                VehiclePublishReceive receiveVo = selectById(id);
+                if (receiveVo != null ){
                     String vehicleId = receiveVo.getVehicleId();
-                    Integer type = receiveVo.getType();
+                    VehiclePublishGoods publishGoods = publishGoodsBiz.selectById(receiveVo.getPublishGoodsId());
+                    if (publishGoods == null )
+                        throw  new BaseException("子需求不存在--id==="+id, ResultCode.FAILED_CODE);
+                    VehiclePublish vehiclePublish = vehiclePublishBiz.selectById(publishGoods.getPublishId());
+                    if (vehiclePublish == null )
+                        throw  new BaseException("需求不存在--id==="+id, ResultCode.FAILED_CODE);
+                    Integer type = vehiclePublish.getType();
                     Integer companyId;
                     if (type == 1){
                         companyId = receiveVo.getPublishCompanyId();