diff --git a/jsowell-admin/src/main/java/com/jsowell/service/PileService.java b/jsowell-admin/src/main/java/com/jsowell/service/PileService.java index 7ceba6b3d..30901858b 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/PileService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/PileService.java @@ -496,7 +496,6 @@ public class PileService { // 充电桩没有绑定任何人 throw new BusinessException(ReturnCodeEnum.CODE_NO_ADMIN_FOR_PILE); } - // 使用stream把relationList转为map, key为type, value为List Map> map = relationList.stream().collect(Collectors.groupingBy(PileMemberRelation::getType)); List adminMemberRelationList = map.get(Constants.ONE); // 管理员列表 @@ -513,26 +512,28 @@ public class PileService { // 如果不为空,说明被分享的用户是管理员,抛出异常 throw new BusinessException(ReturnCodeEnum.CODE_ALREADY_AN_ADMIN); } - List userList = userMemberRelations.stream() - .map(PileMemberRelation::getMemberId) - .collect(Collectors.toList()); + List userList = Lists.newArrayList(); + if (CollectionUtils.isNotEmpty(userMemberRelations)) { + userList = userMemberRelations.stream() + .map(PileMemberRelation::getMemberId) + .collect(Collectors.toList()); + } // 校验身份 入参是否是普通用户 if (userList.contains(memberId)) { // 不为空说明已绑定 throw new BusinessException(ReturnCodeEnum.CODE_ALREADY_AN_USER); - } else { - PileMemberRelation pileMemberRelation = adminMemberRelationList.get(0); // 获取管理员列表的第一个元素 - // 进行绑定,此用户为普通用户 - PileMemberRelation info = new PileMemberRelation(); - info.setPileSn(dto.getPileSn()); - info.setMemberId(memberId); - info.setType(Constants.TWO); - if (pileMemberRelation != null && StringUtils.isNotBlank(pileMemberRelation.getDeviceId())) { - info.setDeviceId(pileMemberRelation.getDeviceId()); - info.setDeviceName(pileMemberRelation.getDeviceName()); - } - pileMemberRelationService.insertPileMemberRelation(info); } + PileMemberRelation pileMemberRelation = adminMemberRelationList.get(0); // 获取管理员列表的第一个元素 + // 进行绑定,此用户为普通用户 + PileMemberRelation info = new PileMemberRelation(); + info.setPileSn(dto.getPileSn()); + info.setMemberId(memberId); + info.setType(Constants.TWO); + if (pileMemberRelation != null && StringUtils.isNotBlank(pileMemberRelation.getDeviceId())) { + info.setDeviceId(pileMemberRelation.getDeviceId()); + info.setDeviceName(pileMemberRelation.getDeviceName()); + } + pileMemberRelationService.insertPileMemberRelation(info); } /**