wangli/nanopart
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

REQ-3581: 用印排序

Browse Source
This commit is contained in:
yanglin 2025-03-05 11:51:17 +08:00
parent eaa4c7a7db
commit 257094b191
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/QueryService.java
View File

@ -2,11 +2,13 @@
package cn.axzo.nanopart.ess.server.ess;
import static java.util.stream.Collectors.groupingBy;
import static java.util.stream.Collectors.toList;
import static java.util.stream.Collectors.toSet;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
@ -44,6 +46,7 @@ import cn.axzo.nanopart.ess.server.ess.domain.EssPersons;
import cn.axzo.nanopart.ess.server.ess.support.EssSupport;
import cn.axzo.nanopart.ess.server.ess.support.PersonProfiles;
import cn.axzo.nanopart.ess.server.utils.BizAssertions;
import cn.axzo.pokonyan.config.mybatisplus.BaseEntity;
import lombok.RequiredArgsConstructor;
/**
@ -115,7 +118,10 @@ public class QueryService {
essOrgAndSeals.add(orgAndSeal);
orgAndSeal.setOrg(BeanMapper.copyBean(org, EssOrgInfo.class));
orgAndSeal.getOrg().setOrgAuthorized(org.isAuthorized());
List<EssSeal> seals = ouId2Seals.getOrDefault(org.getOuId(), Collections.emptyList());
List<EssSeal> seals = ouId2Seals //
.getOrDefault(org.getOuId(), Collections.emptyList()).stream() //
.sorted(Comparator.comparingLong(BaseEntity::getId)) //
.collect(toList());
orgAndSeal.setSeals(BeanMapper.copyList(seals, EssSealInfo.class));
for (EssSealInfo sealInfo : orgAndSeal.getSeals()) {
List<EssSealPerson> persons = new ArrayList<>(