rakor
/
mobilebroken
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'prod/20260407' into test

This commit is contained in:
曹鹏飞 2026-04-15 13:39:11 +08:00
parent f5c69fc980 6c188b1863
commit fbe2529922
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketSolutionServiceImpl.java
View File

@ -92,8 +92,8 @@ public class TicketSolutionServiceImpl extends ServiceImpl<TicketSolutionMapper,
if (CollectionUtil.isEmpty(groupedSolutions)) { if (CollectionUtil.isEmpty(groupedSolutions)) {
items = initial.stream().map(it -> new SolutionMeasuresItemVO() items = initial.stream().map(it -> new SolutionMeasuresItemVO()
.setId(it.getId()) .setId(it.getId())
.setName(it.getName()) .setName(it.getValue())
.setType(it.getValue()) .setType(it.getName())
.setItems(Collections.emptyList())) .setItems(Collections.emptyList()))
.collect(Collectors.toList()); .collect(Collectors.toList());
} else if (CollectionUtil.isEmpty(initial)) { } else if (CollectionUtil.isEmpty(initial)) {
@ -119,15 +119,15 @@ public class TicketSolutionServiceImpl extends ServiceImpl<TicketSolutionMapper,
if (CollectionUtil.isEmpty(values)) { if (CollectionUtil.isEmpty(values)) {
items.add(new SolutionMeasuresItemVO() items.add(new SolutionMeasuresItemVO()
.setId(it.getId()) .setId(it.getId())
.setName(it.getName()) .setName(it.getValue())
.setType(it.getValue()) .setType(it.getName())
.setItems(Collections.emptyList()) .setItems(Collections.emptyList())
); );
} else { } else {
items.add(new SolutionMeasuresItemVO() items.add(new SolutionMeasuresItemVO()
.setId(it.getId()) .setId(it.getId())
.setName(it.getName()) .setName(it.getValue())
.setType(it.getValue()) .setType(it.getName())
.setItems(values.stream().map(v -> new SolutionMeasuresDataItemVO() .setItems(values.stream().map(v -> new SolutionMeasuresDataItemVO()
.setId(Long.valueOf(v.getId())) .setId(Long.valueOf(v.getId()))
.setName(v.getDescription()) .setName(v.getDescription())