From a8b8865348d2ec9d9f4af9c91870422812798ef7 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Thu, 12 Dec 2024 14:54:18 +0800 Subject: [PATCH] =?UTF-8?q?=E8=93=9D=E7=89=99=E6=A1=A9=E5=88=86=E4=BA=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/jsowell/service/PileService.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 30901858b..674f7ce4e 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/PileService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/PileService.java @@ -499,7 +499,7 @@ public class PileService { // 使用stream把relationList转为map, key为type, value为List Map> map = relationList.stream().collect(Collectors.groupingBy(PileMemberRelation::getType)); List adminMemberRelationList = map.get(Constants.ONE); // 管理员列表 - List userMemberRelations = map.get(Constants.TWO); // 普通用户列表 + if (CollectionUtils.isEmpty(adminMemberRelationList)) { // 充电桩没有管理员 throw new BusinessException(ReturnCodeEnum.CODE_NO_ADMIN_FOR_PILE); @@ -512,7 +512,9 @@ public class PileService { // 如果不为空，说明被分享的用户是管理员，抛出异常 throw new BusinessException(ReturnCodeEnum.CODE_ALREADY_AN_ADMIN); } + List userList = Lists.newArrayList(); + List userMemberRelations = map.get(Constants.TWO); // 普通用户列表 if (CollectionUtils.isNotEmpty(userMemberRelations)) { userList = userMemberRelations.stream() .map(PileMemberRelation::getMemberId)