李昊 4 年之前
父節點
當前提交
1fe5ddea81

+ 1 - 1
gx_api/GxPress/Api/GxPress.Api/AppControllers/AddressBookGroupUserController.cs

@@ -80,7 +80,7 @@ namespace GxPress.Api.AppControllers
 
             if (await _addressBookGroupUserRepository.InsertAsync(request))
             {
-                return await friendsRepository.UpdateAddressBookGroupId(new List<int> { request.UserId }, _loginContext.AccountId, request.AddressBookGroupId);
+                return await friendsRepository.UpdateAddressBookGroupId(request.UserId, _loginContext.AccountId, request.AddressBookGroupId);
             }
             return false;
         }

+ 1 - 1
gx_api/GxPress/Api/GxPress.Api/WebControllers/AddressBookGroupUserController.cs

@@ -79,7 +79,7 @@ namespace GxPress.Api.AppControllers
         {
             if (await _addressBookGroupUserRepository.InsertAsync(request))
             {
-                return await friendsRepository.UpdateAddressBookGroupId(new List<int> { request.UserId }, _loginContext.AccountId, request.AddressBookGroupId);
+                return await friendsRepository.UpdateAddressBookGroupId(request.UserId, _loginContext.AccountId, request.AddressBookGroupId);
             }
             return false;
         }

+ 2 - 4
gx_api/GxPress/Model/GxPress.Request/AddressBookGroupUser/AddressBookGroupUserInRequest.cs

@@ -1,13 +1,11 @@
-using System;
 using System.Collections.Generic;
-using System.Text;
 
 namespace GxPress.Request.AddressBookGroupUser
 {
     /// <summary>
     /// 插入通讯录用户
     /// </summary>
-   public class AddressBookGroupUserInRequest
+    public class AddressBookGroupUserInRequest
     {
         /// <summary>
         /// 通讯录组ID
@@ -16,6 +14,6 @@ namespace GxPress.Request.AddressBookGroupUser
         /// <summary>
         /// 用户ID
         /// </summary>
-        public int UserId { get; set; }
+        public List<int> UserId { get; set; }
     }
 }

+ 21 - 14
gx_api/GxPress/Repository/GxPress.Repository.Implement/AddressBookGroupUserRepository.cs

@@ -106,21 +106,28 @@ namespace GxPress.Repository.Implement
             var addressBookGroup = await _addressBookGroupRepository.GetAsync(request.AddressBookGroupId);
             if (addressBookGroup == null)
                 throw new BusinessException("通讯录组不存在!");
-            var user = await _userRepository.GetAsync(request.UserId);
-            if (user == null)
-                throw new BusinessException("用户不存在!");
-            var addressBookGroupUserEntity = await _repository.GetAsync(Q
-                .Where(nameof(AddressBookGroupUser.UserId), request.UserId)
-                .Where(nameof(AddressBookGroupUser.AddressBookGroupId), request.AddressBookGroupId));
-            if (addressBookGroupUserEntity != null)
-                throw new BusinessException("用户已经存在!");
-            var addressBookGroupUser = new AddressBookGroupUser
+            try
+            {
+                using (var trans = new TransactionScope())
+                {
+                    foreach (var item in request.UserId)
+                    {
+                        var addressBookGroupUser = new AddressBookGroupUser
+                        {
+                            AddressBookGroupId = request.AddressBookGroupId,
+                            UserId = item
+                        };
+                        //查询用户是否是好友
+                        await _repository.InsertAsync(addressBookGroupUser);
+                    }
+                    trans.Complete();
+                }
+            }
+            catch
             {
-                AddressBookGroupId = request.AddressBookGroupId,
-                UserId = request.UserId
-            };
-            //查询用户是否是好友
-            return await _repository.InsertAsync(addressBookGroupUser) > 0;
+                return false;
+            }
+            return true;
         }
         /// <summary>
         /// 移动分组成员到分组下面

+ 1 - 1
gx_api/GxPress/Service/GxPress.Service.Implement/AdminVerify/AdminVerifyService.cs

@@ -103,7 +103,7 @@ namespace GxPress.Service.Implement.AdminVerify
                         await addressBookGroupUserRepository.InsertAsync(new AddressBookGroupUserInRequest
                         {
                             AddressBookGroupId = adminVerify.AddressBookGroupId,
-                            UserId = adminVerify.AdminId
+                            UserId = new List<int> { adminVerify.AdminId }
                         });
                     }
                     //自己好友