Commit cb160583b456b6a78493af4b184fe694c09d01ef
1 parent
25f030dd
fix(hrm): 修复工资表生成空分类表头
关联：https://t.zsxq.com/WRIEJ
Showing
1 changed file
with
2 additions
and
0 deletions
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/salary/monthrecord/HrmSalaryMonthRecordServiceImpl.java
| @@ -711,6 +711,8 @@ public class HrmSalaryMonthRecordServiceImpl implements HrmSalaryMonthRecordServ | @@ -711,6 +711,8 @@ public class HrmSalaryMonthRecordServiceImpl implements HrmSalaryMonthRecordServ | ||
| 711 | convertMultiMap(options, HrmSalaryOptionDO::getParentCode); | 711 | convertMultiMap(options, HrmSalaryOptionDO::getParentCode); |
| 712 | List<HrmSalaryOptionDO> categories = | 712 | List<HrmSalaryOptionDO> categories = |
| 713 | childrenMap.getOrDefault(ROOT_PARENT_CODE, Collections.emptyList()); | 713 | childrenMap.getOrDefault(ROOT_PARENT_CODE, Collections.emptyList()); |
| 714 | + // 分类下没有可见明细时，不生成空表头 | ||
| 715 | + categories = filterList(categories, category -> CollUtil.isNotEmpty(childrenMap.get(category.getCode()))); | ||
| 714 | return convertList(categories, category -> { | 716 | return convertList(categories, category -> { |
| 715 | List<HrmSalaryMonthRecordDO.OptionHeader> children = convertList( | 717 | List<HrmSalaryMonthRecordDO.OptionHeader> children = convertList( |
| 716 | childrenMap.getOrDefault(category.getCode(), Collections.emptyList()), | 718 | childrenMap.getOrDefault(category.getCode(), Collections.emptyList()), |