diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/customersettlement/CustomerSettlementServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/customersettlement/CustomerSettlementServiceImpl.java index 24f9c51b..c36a80e0 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/customersettlement/CustomerSettlementServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/customersettlement/CustomerSettlementServiceImpl.java @@ -99,6 +99,7 @@ public class CustomerSettlementServiceImpl implements CustomerSettlementService // 获取需创建的 结算明细 List createDO = BeanUtils.toBean(updateReqVO.getSettlementItems(), SettlementItemDO.class).stream() .filter(item -> item.getId() == null) + .map(item -> item.setSettlementId(updateReqVO.getId())) .collect(Collectors.toList()); // 获取需更新的 结算明细 List updateDO = BeanUtils.toBean(updateReqVO.getSettlementItems(), SettlementItemDO.class).stream() diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java index edf37cd4..488a9acb 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java @@ -338,7 +338,8 @@ public class DeptServiceImpl implements DeptService { .eq(DeptDO::getStatus, CommonStatusEnum.ENABLE.getStatus()) .eq(DeptDO::getType, DeptTypeEnum.COMPANY.getValue()) .or() - .eq(DeptDO::getType, DeptTypeEnum.HEAD_COMPANY.getValue())); + .eq(DeptDO::getType, DeptTypeEnum.HEAD_COMPANY.getValue()) + .ne(DeptDO::getLevel, 0)); }