Showing
1 changed file
with
7 additions
and
1 deletions
| @@ -207,7 +207,13 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP | @@ -207,7 +207,13 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP | ||
| 207 | existOrderSpecIds.addAll(orderSpecIds); | 207 | existOrderSpecIds.addAll(orderSpecIds); |
| 208 | } | 208 | } |
| 209 | } | 209 | } |
| 210 | - vo.setOrderSpecIds(existOrderSpecIds); | 210 | + List<String> orderSpecIds = vo.getOrderSpecIds(); |
| 211 | + if (CollectionUtils.isNotEmpty(orderSpecIds)) { | ||
| 212 | + orderSpecIds.addAll(existOrderSpecIds); | ||
| 213 | + } else { | ||
| 214 | + orderSpecIds = existOrderSpecIds; | ||
| 215 | + } | ||
| 216 | + vo.setOrderSpecIds(orderSpecIds); | ||
| 211 | // 业务员做权限控制 | 217 | // 业务员做权限控制 |
| 212 | List<String> userIds = new ArrayList<>(); | 218 | List<String> userIds = new ArrayList<>(); |
| 213 | String currentUserId = SecurityUtil.getCurrentUser().getId(); | 219 | String currentUserId = SecurityUtil.getCurrentUser().getId(); |