|
|
@@ -37,6 +37,8 @@ import java.util.Map;
|
|
|
import java.util.concurrent.TimeUnit;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
+import static com.yc.ship.framework.security.core.util.SecurityFrameworkUtils.getLoginDistributorId;
|
|
|
+
|
|
|
|
|
|
/**
|
|
|
* 航次库存分配 Service 实现类
|
|
|
@@ -185,7 +187,8 @@ public class VoyageStockDistributeNewServiceImpl implements VoyageStockDistribut
|
|
|
roomList = new ArrayList<>();
|
|
|
}
|
|
|
List<Long> roomIds = CollectionUtils.convertList(roomList, VoyageStockDistributeRoomDO::getRoomId);
|
|
|
- if(CollectionUtils.isAnyEmpty(roomIds) && reqVO.getDistributorId() == null && reqVO.getStoreId() == null) {
|
|
|
+ Long loginDistributorId = getLoginDistributorId();
|
|
|
+ if(CollectionUtils.isAnyEmpty(roomIds) && loginDistributorId == null) {
|
|
|
List<RoomRespDTO> canSelectRoomList = roomApi.getCanSelectRoomList(reqVO.getShipId(), reqVO.getRoomModelIdFloorList());
|
|
|
roomIds = CollectionUtils.convertList(canSelectRoomList, RoomRespDTO::getId);
|
|
|
}
|