From 38a9bd95223e293cbb52e2632537b3061e30bde6 Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Thu, 12 Dec 2024 14:52:30 +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

---
 .../java/com/jsowell/service/PileService.java | 33 ++++++++++---------
 1 file changed, 17 insertions(+), 16 deletions(-)

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<PileMemberRelation>
 		Map<String, List<PileMemberRelation>> map = relationList.stream().collect(Collectors.groupingBy(PileMemberRelation::getType));
 		List<PileMemberRelation> adminMemberRelationList = map.get(Constants.ONE); // 管理员列表
@@ -513,26 +512,28 @@ public class PileService {
 			// 如果不为空，说明被分享的用户是管理员，抛出异常
 			throw new BusinessException(ReturnCodeEnum.CODE_ALREADY_AN_ADMIN);
 		}
-		List<String> userList = userMemberRelations.stream()
-				.map(PileMemberRelation::getMemberId)
-				.collect(Collectors.toList());
+		List<String> 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);
 	}
 
 	/**