wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into docker_package

This commit is contained in:
wangliwen 2022-12-16 18:38:56 +08:00
parent 2e2f506866 220c2a3fa3
commit c696d9ece9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
renren-admin/src/main/java/io/renren/modules/audit_team/controller/SysAuditTeamController.java
View File

@ -80,7 +80,7 @@ public class SysAuditTeamController {
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
dto.setIndex(CommonUtils.getPinYinHeadChar(dto.getName())); // 索引设置为名称拼音 dto.setIndex(CommonUtils.getPinYinHeadChar(dto.getName())); // 索引设置为名称拼音
dto.setMember(dto.getMember().stream().map(index -> { dto.setMember(dto.getMember().stream().map(index -> {
Optional<SysUserDTO> sysUserDTO = Optional.ofNullable(sysUserService.get(Long.parseLong((String) index.get("id")))); Optional<SysUserDTO> sysUserDTO = Optional.ofNullable(sysUserService.get(Long.parseLong(index.get("id").toString())));
index.put("id", Long.parseLong((String) index.get("id"))); index.put("id", Long.parseLong((String) index.get("id")));
if (sysUserDTO.isPresent()) { if (sysUserDTO.isPresent()) {
index.put("name", sysUserDTO.get().getRealName()); index.put("name", sysUserDTO.get().getRealName());
@ -101,7 +101,7 @@ public class SysAuditTeamController {
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
dto.setIndex(CommonUtils.getPinYinHeadChar(dto.getName())); // 索引设置为名称拼音 dto.setIndex(CommonUtils.getPinYinHeadChar(dto.getName())); // 索引设置为名称拼音
dto.setMember(dto.getMember().stream().map(index -> { dto.setMember(dto.getMember().stream().map(index -> {
Optional<SysUserDTO> sysUserDTO = Optional.ofNullable(sysUserService.get(Long.parseLong((String) index.get("id")))); Optional<SysUserDTO> sysUserDTO = Optional.ofNullable(sysUserService.get(Long.parseLong(index.get("id").toString())));
index.put("id", Long.parseLong((String) index.get("id"))); index.put("id", Long.parseLong((String) index.get("id")));
if (sysUserDTO.isPresent()) { if (sysUserDTO.isPresent()) {
index.put("name", sysUserDTO.get().getRealName()); index.put("name", sysUserDTO.get().getRealName());