ak/zn-cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(system): 修复客户结算和部门选择相关问题

Browse Source 
- 在客户结算中，为新创建的结算明细设置结算单 ID
- 在部门选择中，排除 level 为 0 的总部重复选项
This commit is contained in:
furongxin 2025-04-23 09:15:24 +08:00
parent cb7c1fd484
commit d422522eb8
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/customersettlement/CustomerSettlementServiceImpl.java
View File

@ -99,6 +99,7 @@ public class CustomerSettlementServiceImpl implements CustomerSettlementService
// 获取需创建的 结算明细 // 获取需创建的 结算明细
List<SettlementItemDO> createDO = BeanUtils.toBean(updateReqVO.getSettlementItems(), SettlementItemDO.class).stream() List<SettlementItemDO> createDO = BeanUtils.toBean(updateReqVO.getSettlementItems(), SettlementItemDO.class).stream()
.filter(item -> item.getId() == null) .filter(item -> item.getId() == null)
.map(item -> item.setSettlementId(updateReqVO.getId()))
.collect(Collectors.toList()); .collect(Collectors.toList());
// 获取需更新的 结算明细 // 获取需更新的 结算明细
List<SettlementItemDO> updateDO = BeanUtils.toBean(updateReqVO.getSettlementItems(), SettlementItemDO.class).stream() List<SettlementItemDO> updateDO = BeanUtils.toBean(updateReqVO.getSettlementItems(), SettlementItemDO.class).stream()

3
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java
View File

@ -338,7 +338,8 @@ public class DeptServiceImpl implements DeptService {
.eq(DeptDO::getStatus, CommonStatusEnum.ENABLE.getStatus()) .eq(DeptDO::getStatus, CommonStatusEnum.ENABLE.getStatus())
.eq(DeptDO::getType, DeptTypeEnum.COMPANY.getValue()) .eq(DeptDO::getType, DeptTypeEnum.COMPANY.getValue())
.or() .or()
.eq(DeptDO::getType, DeptTypeEnum.HEAD_COMPANY.getValue())); .eq(DeptDO::getType, DeptTypeEnum.HEAD_COMPANY.getValue())
.ne(DeptDO::getLevel, 0));
} }