😒调整子管理员管理下级用户的模式及其他优化

Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj

@@ -32,7 +32,7 @@
     <PackageReference Include="OnceMi.AspNetCore.OSS" Version="1.1.9" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="2.30.0" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="2.19.0" />
-    <PackageReference Include="SqlSugarCore" Version="5.1.4.91" />
+    <PackageReference Include="SqlSugarCore" Version="5.1.4.94-preview01" />
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.3.3" />
     <PackageReference Include="UAParser" Version="3.1.47" />
     <PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />

Admin.NET/Admin.NET.Core/Service/User/SysUserService.cs

@@ -45,18 +45,17 @@ public class SysUserService : IDynamicApiController, ITransient
     [DisplayName("获取用户分页列表")]
     public async Task<SqlSugarPagedList<SysUser>> Page(PageUserInput input)
     {
-        //得到用户可以管理的机构Id集
-        var userCanMangeList = await _sysOrgService.GetUserOrgIdList();
+        // 获取用户拥有的机构集合
+        var userOrgIdList = await _sysOrgService.GetUserOrgIdList();
         List<long> orgList = null;
-        if (input.OrgId > 0)  //指定选择的机构查询时
+        if (input.OrgId > 0)  // 指定机构查询时
         {
             orgList = await _sysOrgService.GetChildIdListWithSelfById(input.OrgId);
-            orgList = _userManager.SuperAdmin ? orgList : orgList.Where(t => userCanMangeList.Contains(t)).ToList();
+            orgList = _userManager.SuperAdmin ? orgList : orgList.Where(u => userOrgIdList.Contains(u)).ToList();
         }
-        else
+        else // 各管理员只能看到自己机构下的用户列表
         {
-            // 各管理员只能看到自己机构下的用户列表
-            orgList = _userManager.SuperAdmin ? null : userCanMangeList;
+            orgList = _userManager.SuperAdmin ? null : userOrgIdList;
         }
 
         return await _sysUserRep.AsQueryable()

Admin.NET/Admin.NET.Core/Util/CommonUtil.cs

@@ -102,7 +102,7 @@ public static class CommonUtil
         fileName = $"{fileName}_{DateTime.Now.ToString("yyyyMMddHHmmss")}.xlsx";
 
         IImporter importer = new ExcelImporter();
-        MethodInfo generateTemplateMethod = typeof(ExcelImporter).GetMethod("GenerateTemplate");
+        MethodInfo generateTemplateMethod = importer.GetType().GetMethod("GenerateTemplate");
         MethodInfo closedGenerateTemplateMethod = generateTemplateMethod.MakeGenericMethod(fileDto.GetType());
         var res = await (Task<dynamic>)closedGenerateTemplateMethod.Invoke(importer, new object[] { Path.Combine(App.WebHostEnvironment.WebRootPath, fileName) });
 
@@ -121,7 +121,7 @@ public static class CommonUtil
         var filePath = Path.Combine(App.WebHostEnvironment.WebRootPath, newFile.FilePath, newFile.Name);
 
         IImporter importer = new ExcelImporter();
-        MethodInfo importMethod = typeof(ExcelImporter).GetMethod("Import");
+        MethodInfo importMethod = importer.GetType().GetMethod("Import");
         MethodInfo closedImportMethod = importMethod.MakeGenericMethod(dataDto.GetType());
         var res = await (Task<dynamic>)closedImportMethod.Invoke(importer, new object[] { filePath });
         if (res == null || res.Exception != null)