WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_20240116_OTA' into dev_20240116_OTA

Browse Source
This commit is contained in:
zyn
2024-01-17 16:58:53 +08:00
parent 20aeb8359d de9f504959
commit c1835c8a9b
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+8 -1
View File
@@ -13190,9 +13190,16 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
} }
} }
List<SysUser> sysUserList = new ArrayList<>(); List<SysUser> sysUserList = new ArrayList<>();
if(ObjectUtils.isNotEmpty(userIdList)){ if(ObjectUtils.isNotEmpty(userIdList)) {
userIdList = userIdList.stream().distinct().collect(Collectors.toList()); userIdList = userIdList.stream().distinct().collect(Collectors.toList());
sysUserList = sysUserService.querySysUserListByIdList(userIdList); sysUserList = sysUserService.querySysUserListByIdList(userIdList);
//排序
Collator comparator = Collator.getInstance(Locale.CHINESE);
Collections.sort(sysUserList, (e1, e2) -> {
String e1Username = StringUtils.isNotBlank(e1.getUsername()) ? e1.getUsername() : "";
String e2Username = StringUtils.isNotBlank(e2.getUsername()) ? e2.getUsername() : "";
return comparator.compare(e1Username, e2Username);
});
} }
return sysUserList; return sysUserList;
} }