fix(system): 修复客户结算和部门选择相关问题
- 在客户结算中,为新创建的结算明细设置结算单 ID - 在部门选择中,排除 level 为 0 的总部重复选项
This commit is contained in:
parent
cb7c1fd484
commit
d422522eb8
@ -99,6 +99,7 @@ public class CustomerSettlementServiceImpl implements CustomerSettlementService
|
||||
// 获取需创建的 结算明细
|
||||
List<SettlementItemDO> createDO = BeanUtils.toBean(updateReqVO.getSettlementItems(), SettlementItemDO.class).stream()
|
||||
.filter(item -> item.getId() == null)
|
||||
.map(item -> item.setSettlementId(updateReqVO.getId()))
|
||||
.collect(Collectors.toList());
|
||||
// 获取需更新的 结算明细
|
||||
List<SettlementItemDO> updateDO = BeanUtils.toBean(updateReqVO.getSettlementItems(), SettlementItemDO.class).stream()
|
||||
|
@ -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));
|
||||
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user