Compare commits

..

3 Commits

Author SHA1 Message Date
wangliwen 4108f2955b Merge branch 'master' into docker_package 2022-12-16 18:50:55 +08:00
wangliwen 6f6c04c712 Merge branch 'dev' 2022-12-16 18:50:48 +08:00
wangliwen 498f86e5f7 ... 2022-12-16 18:50:41 +08:00
1 changed files with 2 additions and 2 deletions

View File

@ -81,7 +81,7 @@ public class SysAuditTeamController {
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(index.get("id").toString()))); 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(index.get("id").toString()));
if (sysUserDTO.isPresent()) { if (sysUserDTO.isPresent()) {
index.put("name", sysUserDTO.get().getRealName()); index.put("name", sysUserDTO.get().getRealName());
index.put("dept_name", sysUserDTO.get().getDeptName()); index.put("dept_name", sysUserDTO.get().getDeptName());
@ -102,7 +102,7 @@ public class SysAuditTeamController {
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(index.get("id").toString()))); 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(index.get("id").toString()));
if (sysUserDTO.isPresent()) { if (sysUserDTO.isPresent()) {
index.put("name", sysUserDTO.get().getRealName()); index.put("name", sysUserDTO.get().getRealName());
index.put("dept_name", sysUserDTO.get().getDeptName()); index.put("dept_name", sysUserDTO.get().getDeptName());