From 1d2e2ee00ed42265fc0c45688d9040701543909f Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 11 六月 2020 17:50:21 +0800
Subject: [PATCH] 云发单调整

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/user/cloud/UserCloudGroupServiceImpl.java |   22 ++++++++++++++++++++++
 1 files changed, 22 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/cloud/UserCloudGroupServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/cloud/UserCloudGroupServiceImpl.java
index ef9fb9b..c8adfa2 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/cloud/UserCloudGroupServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/cloud/UserCloudGroupServiceImpl.java
@@ -12,6 +12,7 @@
 import com.yeshi.fanli.entity.bus.user.cloud.UserCloudGroup;
 import com.yeshi.fanli.exception.user.cloud.UserCloudGroupException;
 import com.yeshi.fanli.service.inter.user.cloud.UserCloudGroupService;
+import com.yeshi.fanli.util.StringUtil;
 import com.yeshi.fanli.util.annotation.RequestSerializableByKeyService;
 
 
@@ -49,6 +50,11 @@
 		for (UserCloudGroup userCloudGroup: list) {
 			if (groupId.equals(userCloudGroup.getGroupId())) {
 				exist = true;
+				// 缇ゅ悕涓虹┖
+				if (StringUtil.isNullOrEmpty(groupName)) {
+					return;
+				}
+				
 				// 缇ゅ悕瀛楀彉鍖�
 				if (!groupName.equals(userCloudGroup.getGroupName())) {
 					UserCloudGroup update = new UserCloudGroup();
@@ -62,6 +68,11 @@
 		
 		if (exist) 
 			return;
+		
+		// 缇ゅ悕涓虹┖
+		if (StringUtil.isNullOrEmpty(groupName)) {
+			groupName = "鏈兢鏈懡鍚嶅悕绉�";
+		}
 		
 		UserCloudGroup cloudGroup = new UserCloudGroup();
 		cloudGroup.setUid(uid);
@@ -103,6 +114,17 @@
 		userCloudGroupMapper.updateByPrimaryKeySelective(update);
 	}
 	
+	@Override
+	public void deleteGroup(long uid, long id) throws UserCloudGroupException{
+		UserCloudGroup cloudGroup = userCloudGroupMapper.selectByPrimaryKey(id);
+		if (cloudGroup == null || cloudGroup.getUid() != uid)
+			throw new UserCloudGroupException(1, "璇ヨ褰曞凡涓嶅瓨鍦�");
+		
+		if (cloudGroup.getUid() != uid) {
+			throw new UserCloudGroupException(1, "璇ョ兢宸蹭笉瀛樺湪");
+		}
+		userCloudGroupMapper.deleteByPrimaryKey(id);
+	}
 	
 	@Override
 	public void deleteGroupByUid(Long uid){

--
Gitblit v1.8.0