页面修改

Mall.Module.User/MiniprogramAdminModule.cs

@@ -31,6 +31,23 @@ namespace Mall.Module.User
             return miniprogram_AdminRepository.GetMiniprogramAdminPageRepository(pageIndex, pageSize, out rowsCount, query);
         }
 
+        /// <summary>
+        /// 检查用户是否存在
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool CheckExistsAdminModule(RB_Miniprogram_Admin_Extend model)
+        {
+            var oldModel = miniprogram_AdminRepository.GetMiniprogramAdminEntityRepository(new RB_Miniprogram_Admin_Extend()
+            {
+                TenantId = model.TenantId,
+                MallBaseId = model.MallBaseId,
+                UserId = model.UserId
+            });
+            var flag= oldModel?.AdminId > 0;
+            return flag;
+        }
+
         /// <summary>
         /// 新增修改小程序管理员
         /// </summary>
@@ -38,7 +55,14 @@ namespace Mall.Module.User
         /// <returns></returns>
         public bool SetMiniprogramAdminModule(RB_Miniprogram_Admin_Extend model)
         {
-            bool flag = false;
+            bool flag;
+            var oldModel = miniprogram_AdminRepository.GetMiniprogramAdminEntityRepository(new RB_Miniprogram_Admin_Extend()
+            {
+                TenantId = model.TenantId,
+                MallBaseId = model.MallBaseId,
+                UserId = model.UserId
+            });
+            model.AdminId = oldModel?.AdminId ?? 0;
             if (model.AdminId > 0)
             {
                 Dictionary<string, object> fileds = new Dictionary<string, object>()

Mall.Repository/User/RB_Miniprogram_AdminRepository.cs

@@ -52,7 +52,51 @@ WHERE 1=1
                     builder.AppendFormat(" AND B.{0}={1} ", nameof(RB_Miniprogram_Admin_Extend.Source), (int)query.Source);
                 }
             }
+            builder.AppendFormat(" ORDER BY A.{0} DESC ", nameof(RB_Miniprogram_Admin_Extend.AdminId));
             return GetPage<RB_Miniprogram_Admin_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
         }
+
+
+        /// <summary>
+        /// 获取管理员实体
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public RB_Miniprogram_Admin_Extend GetMiniprogramAdminEntityRepository( RB_Miniprogram_Admin_Extend query)
+        {
+            DynamicParameters parameters = new DynamicParameters();
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT A.*,B.Photo,B.Moblie,B.`Name`,B.OpenId,B.Source
+FROM rb_miniprogram_admin AS A LEFT JOIN rb_member_user AS B ON A.UserId=B.Id
+WHERE 1=1
+");
+            builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Miniprogram_Admin_Extend.Status), (int)DateStateEnum.Normal);
+            if (query != null)
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Miniprogram_Admin_Extend.TenantId), query.TenantId);
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Miniprogram_Admin_Extend.MallBaseId), query.MallBaseId);
+                }
+                if (!string.IsNullOrEmpty(query.Name))
+                {
+                    builder.AppendFormat($@" and B.{nameof(RB_Miniprogram_Admin_Extend.Name)} like @Name ");
+                    parameters.Add("Name", "%" + query.Name.Trim() + "%");
+                }
+                if (query.Source > 0)
+                {
+                    builder.AppendFormat(" AND B.{0}={1} ", nameof(RB_Miniprogram_Admin_Extend.Source), (int)query.Source);
+                }
+                if (query.UserId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Miniprogram_Admin_Extend.UserId), query.UserId);
+                }
+            }
+            return Get<RB_Miniprogram_Admin_Extend>(builder.ToString(), parameters)?.FirstOrDefault();
+        }
     }
 }

Mall.WebApi/Controllers/User/UserController.cs

@@ -941,6 +941,11 @@ namespace Mall.WebApi.Controllers.User
             {
                 return ApiResult.ParamIsNull(message:"请选择小程序用户!");
             }
+            if (adminModule.CheckExistsAdminModule(demodel))
+            {
+                return ApiResult.Failed(message:"已存在此用户!");
+            }
+
             bool flag = adminModule.SetMiniprogramAdminModule(demodel);
             if (flag)
             {