|
|
@@ -521,7 +521,7 @@ public class KwoTradeOrderService {
|
|
|
List<KwoTradeOrderUnit> units = kwoTradeOrderUnitService.getByOrderId(id);
|
|
|
if (CollectionUtils.isNotEmpty(units)) {
|
|
|
List<UnitInfoDetailRes> unitInfos = new ArrayList<>(units.size());
|
|
|
- units.forEach(e->{
|
|
|
+ units.forEach(e -> {
|
|
|
UnitInfoDetailRes unit = BeanUtils.copyProperties(e, UnitInfoDetailRes.class);
|
|
|
unit.setUnitTypeLabel(DictEnum.getLabel(DictTypeEnum.TORDER_UNIT_TYPE.getType(), unit.getUnitType()));
|
|
|
unitInfos.add(unit);
|
|
|
@@ -947,7 +947,8 @@ public class KwoTradeOrderService {
|
|
|
}
|
|
|
//排除草稿状态权限匹配
|
|
|
List<Long> filterIds = list.stream().filter(e -> !(Objects.equals(e.getStatus(), 0))).map(KwoTradeOrder::getId).toList();
|
|
|
- if (kwoTradeOrderUnitService.entBatchMatch(filterIds, LoginUserHolder.getEntId(), String.valueOf(param.getOrderType()))) {
|
|
|
+ if (CollectionUtils.isNotEmpty(filterIds) &&
|
|
|
+ kwoTradeOrderUnitService.entBatchMatch(filterIds, LoginUserHolder.getEntId(), String.valueOf(param.getOrderType()))) {
|
|
|
throw new BusinessException("无订单操作权限!");
|
|
|
}
|
|
|
LambdaUpdateWrapper<KwoTradeOrder> updateWrapper = new LambdaUpdateWrapper<>();
|