Merge commit 'd1108700e0ad43b6bfea3f9a79bbb14799a2d29c'

ZR.Service/System/CommonLangService.cs

@@ -82,7 +82,7 @@ namespace ZR.Service.System
                     LangName = item.LangName,
                 });
             }
-            var storage = Storageable(langs)
+            var storage = Context.Storageable(langs)
                 .WhereColumns(it => new { it.LangKey, it.LangCode })
                 .ToStorage();
 
@@ -110,7 +110,11 @@ namespace ZR.Service.System
         /// <returns></returns>
         public (string, object, object) ImportCommonLang(List<CommonLang> list)
         {
+<<<<<<< HEAD
             var x = Storageable(list)
+=======
+            var x = Context.Storageable(list)
+>>>>>>> d1108700e0ad43b6bfea3f9a79bbb14799a2d29c
                 .WhereColumns(it => new { it.LangKey, it.LangCode })
                 .ToStorage();
             x.AsInsertable.ExecuteReturnSnowflakeIdList();//插入可插入部分;

ZR.Service/System/IService/ISysUserService.cs

@@ -28,7 +28,7 @@ namespace ZR.Service.System.IService
         /// </summary>
         /// <param name="sysUser"></param>
         /// <returns></returns>
-        public long InsertUser(SysUser sysUser);
+        public SysUser InsertUser(SysUser sysUser);
 
         /// <summary>
         /// 修改用户信息

ZR.Service/System/SysMenuService.cs

@@ -700,7 +700,7 @@ namespace ZR.Service
             }
             //Insert(menuList);
 
-            var x = Storageable(menuList)
+            var x = Context.Storageable(menuList)
                 .SplitInsert(it => !it.Any())
                 .SplitUpdate(it => !it.Any())
                 .WhereColumns(it => new { it.MenuName, it.ParentId })

ZR.Service/System/SysUserPostService.cs

@@ -1,6 +1,5 @@
 using Infrastructure.Attribute;
 using SqlSugar;
-using System.Collections.Generic;
 using System.Linq;
 using ZR.Model.System;
 using ZR.Service.System.IService;
@@ -20,15 +19,14 @@ namespace ZR.Service.System
         public void InsertUserPost(SysUser user)
         {
             // 新增用户与岗位管理
-            List<SysUserPost> list = new List<SysUserPost>();
+            List<SysUserPost> list = new();
             foreach (var item in user.PostIds)
             {
                 list.Add(new SysUserPost() { PostId = item, UserId = user.UserId });
             }
-            Insert(list);
+            InsertRange(list);
         }
 
-
         /// <summary>
         /// 查询用户岗位集合
         /// </summary>

ZR.Service/System/SysUserService.cs

@@ -105,16 +105,14 @@ namespace ZR.Service
         /// </summary>
         /// <param name="sysUser"></param>
         /// <returns></returns>
-        public long InsertUser(SysUser sysUser)
+        public SysUser InsertUser(SysUser sysUser)
         {
-            sysUser.Create_time = DateTime.Now;
-            long userId = Insertable(sysUser).ExecuteReturnIdentity();
-            sysUser.UserId = userId;
+            sysUser.UserId = Insertable(sysUser).ExecuteReturnIdentity();
             //新增用户角色信息
             UserRoleService.InsertUserRole(sysUser);
             //新增用户岗位信息
             UserPostService.InsertUserPost(sysUser);
-            return userId;
+            return sysUser;
         }
 
         /// <summary>