更新控制器

Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/AccountController.cs

@@ -4,6 +4,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Yi.Framework.Common;
 using Yi.Framework.Common.Helper;
 using Yi.Framework.Common.Models;
 using Yi.Framework.Core;

Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/RoleController.cs

@@ -70,7 +70,12 @@ namespace Yi.Framework.ApiMicroservice.Controllers
         /// <returns></returns>
         [HttpPost]
         public async Task<Result> SetMenuByRole(IdsListDto<int>  idsListDto)
-        { 
+        {
+            foreach(var id in idsListDto.ids1)
+            {
+              await _roleService.SetMenusByRolesId(idsListDto.ids2, id);
+            }
+            return Result.Success();
         }
     }
 }

Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/UserController.cs

@@ -85,13 +85,16 @@ namespace Yi.Framework.ApiMicroservice.Controllers
         }
 
         /// <summary>
-        /// 给单个用户设置多个角色，ids有用户id与 角列表色ids，1对多
+        /// 给单个用户设置多个角色，ids有用户id与 角色列表ids，1对多
         /// </summary>
         /// <param name="idsDto"></param>
         /// <returns></returns>
         [HttpPost]
         public async Task<Result> SetRoleByUser(IdsDto<int>  idsDto)
-        { 
+        {
+            var _user = this.HttpContext.GetCurrentUserInfo();
+            await _userService.SetRolesByUserId(idsDto.ids, _user.id);
+            return Result.Success();
         }
     }
 }

Yi.Framework/Yi.Framework.Core/Yi.Framework.Core.csproj

@@ -15,6 +15,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Yi.Framework.Common\Yi.Framework.Common.csproj" />
+    <ProjectReference Include="..\Yi.Framework.Model\Yi.Framework.Model.csproj" />
   </ItemGroup>
 
   <ItemGroup>

Yi.Framework/Yi.Framework.Interface/T4IService.tt

@@ -13,3 +13,22 @@
             Type[] ts = assembly.GetTypes();
 
 #>
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Yi.Framework.Model.Models;
+
+namespace Yi.Framework.Interface
+{
+  public partial class BaseContext :DbContext
+    {
+<#    foreach(string item in ts){
+ #>
+        public partial interface I<#=item #>Dal:IBaseDal<<#=item #>>
+    {
+    }
+<#    } #>
+    }
+}

Yi.Framework/Yi.Framework.Model/DataContext.cs

@@ -12,7 +12,7 @@ namespace Yi.Framework.Model
 {
 	//Add-Migration yi-1
 	//Update-Database yi-1
-   public class DataContext : DbContext
+   public partial class DataContext : DbContext
     {
 		private readonly IOptionsMonitor<SqliteOptions> _optionsMonitor;
 		private readonly string _connStr;

Yi.Framework/Yi.Framework.Model/T4DaraContext.tt

@@ -11,5 +11,24 @@
             string solutionsPath = Host.ResolveAssemblyReference("$(SolutionDir)");//获取解决方案路径
            Assembly assembly = Assembly.LoadFrom(System.IO.Path.Combine(solutionsPath, @"Yi.Framework.ApiMicroservice\bin\Debug\net5.0\Yi.Framework.Model.dll"));
             Type[] ts = assembly.GetTypes();
+            
 
 #>
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Yi.Framework.Model
+{
+    public partial class BaseContext :DbContext
+    {
+<#    foreach(var item in ts){
+  
+ #>
+        public DbSet<<#=item#>> <#=item#> { get; set; }
+<#    } #>
+    }
+}

Yi.Framework/Yi.Framework.Model/Yi.Framework.Model.csproj

@@ -8,14 +8,6 @@
     <Folder Include="Search\" />
   </ItemGroup>
 
-  <ItemGroup>
-    <None Include="T4DaraContext.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>T4DaraContext.tt</DependentUpon>
-    </None>
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.10" />
   </ItemGroup>

Yi.Framework/Yi.Framework.Service/UserService.cs

@@ -41,9 +41,9 @@ namespace Yi.Framework.Service
 
         public async Task<List<menu>> GetMenusByUser(user _user)
         {
-           var user_data= await _Db.Set<user>().Include(u => u.roles).ThenInclude(u => u.menus)
+           var user_data= await _Db.Set<user>().Include(u => u.roles).ThenInclude(u=>u.menus).ThenInclude(u=>u.mould)
                 .Where(u=>u.id==_user.id&& u.is_delete == (short)Common.Enum.DelFlagEnum.Normal).FirstOrDefaultAsync();
-           var menuList= user_data.roles.Select(u => u.menus);
+           var menuList= user_data.roles.Select(u=>u.menus);
             return (List<menu>)menuList;
         }
 
@@ -57,8 +57,10 @@ namespace Yi.Framework.Service
 
         public async Task<List<role>> GetRolesByUser(user _user)
         {
-            var user_data = await GetEntity(u => u.id == _user.id && u.is_delete == (short)Common.Enum.DelFlagEnum.Normal);
+            var user_data = await _Db.Set<user>().Include(u=>u.roles)
-            return (List<role>)user_data.roles;
+                .Where(u => u.id == _user.id && u.is_delete == (short)Common.Enum.DelFlagEnum.Normal).FirstOrDefaultAsync();
+            var roleList = user_data.roles.ToList();
+            return roleList;
         }
 
         public async Task<bool> Login(user _user)