Merge branch 'master' into docker_package

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

@@ -80,7 +80,7 @@ public class SysAuditTeamController {
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
         dto.setIndex(CommonUtils.getPinYinHeadChar(dto.getName())); // 索引设置为名称拼音
         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")));
             if (sysUserDTO.isPresent()) {
                 index.put("name", sysUserDTO.get().getRealName());
@@ -101,7 +101,7 @@ public class SysAuditTeamController {
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
         dto.setIndex(CommonUtils.getPinYinHeadChar(dto.getName())); // 索引设置为名称拼音
         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")));
             if (sysUserDTO.isPresent()) {
                 index.put("name", sysUserDTO.get().getRealName());