Merge branch 'master' into docker_package

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

@@ -81,7 +81,7 @@ public class SysAuditTeamController {
         dto.setIndex(CommonUtils.getPinYinHeadChar(dto.getName())); // 索引设置为名称拼音
         dto.setMember(dto.getMember().stream().map(index -> {
             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()) {
                 index.put("name", sysUserDTO.get().getRealName());
                 index.put("dept_name", sysUserDTO.get().getDeptName());
@@ -102,7 +102,7 @@ public class SysAuditTeamController {
         dto.setIndex(CommonUtils.getPinYinHeadChar(dto.getName())); // 索引设置为名称拼音
         dto.setMember(dto.getMember().stream().map(index -> {
             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()) {
                 index.put("name", sysUserDTO.get().getRealName());
                 index.put("dept_name", sysUserDTO.get().getDeptName());