merge master

ZR.Admin.WebApi/Controllers/System/SysUserController.cs

@@ -20,26 +20,21 @@ namespace ZR.Admin.WebApi.Controllers.System
     [Route("system/user")]
     public class SysUserController : BaseController
     {
-        private readonly NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
-
         private readonly ISysUserService UserService;
         private readonly ISysRoleService RoleService;
         private readonly ISysPostService PostService;
         private readonly ISysUserPostService UserPostService;
-        private IWebHostEnvironment WebHostEnvironment;
 
         public SysUserController(
             ISysUserService userService,
             ISysRoleService roleService,
             ISysPostService postService,
-            ISysUserPostService userPostService,
-            IWebHostEnvironment HostEnvironment)
+            ISysUserPostService userPostService)
         {
             UserService = userService;
             RoleService = roleService;
             PostService = postService;
             UserPostService = userPostService;
-            WebHostEnvironment = HostEnvironment;
         }
 
         /// <summary>

ZR.Admin.WebApi/Extensions/DbExtension.cs

@@ -50,11 +50,11 @@ namespace ZR.Admin.WebApi.Extensions
                 #region db0
                 db.GetConnection(0).Aop.OnLogExecuting = (sql, pars) =>
                 {
-                    var param = DbScoped.SugarScope.Utilities.SerializeObject(pars.ToDictionary(it => it.ParameterName, it => it.Value));
+                    var param = db.Utilities.SerializeObject(pars.ToDictionary(it => it.ParameterName, it => it.Value));
 
-                    FilterData();
+                    FilterData(db.GetConnection(0));
 
-                    logger.Info($"{sql}，{param}");
+                    logger.Info($"【sql语句】{sql}，{param}");
                 };
 
                 db.GetConnection(0).Aop.OnError = (e) =>
@@ -74,7 +74,7 @@ namespace ZR.Admin.WebApi.Extensions
                 {
                     var param = DbScoped.SugarScope.Utilities.SerializeObject(pars.ToDictionary(it => it.ParameterName, it => it.Value));
 
-                    logger.Info($"Sql语句：{sql}, {param}");
+                    logger.Info($"【sql语句】{sql}, {param}");
                 };
                 //Db1错误日志
                 db.GetConnection(1).Aop.OnError = (e) =>
@@ -88,7 +88,7 @@ namespace ZR.Admin.WebApi.Extensions
         /// <summary>
         /// 分页获取count 不会追加sql
         /// </summary>
-        private static void FilterData()
+        private static void FilterData(ISqlSugarClient sqlSugarClient)
         {
             var u = App.User;
             if (u == null) return;
@@ -119,8 +119,7 @@ namespace ZR.Admin.WebApi.Extensions
                     var exp = Expressionable.Create<SysDept>();
                     exp.Or(it => it.DeptId == user.DeptId);
                     var filter1 = new TableFilterItem<SysDept>(exp.ToExpression());
-                    DbScoped.SugarScope.GetConnection(0).QueryFilter.Add(filter1);
-                    Console.WriteLine("本部门数据过滤");
+                    sqlSugarClient.QueryFilter.Add(filter1);
                 }
                 else if (DATA_SCOPE_DEPT_AND_CHILD.Equals(dataScope))//本部门及以下数据
                 {
@@ -128,8 +127,8 @@ namespace ZR.Admin.WebApi.Extensions
                 }
                 else if (DATA_SCOPE_SELF.Equals(dataScope))//仅本人数据
                 {
-                    var filter1 = new TableFilterItem<SysUser>(it => it.UserId == user.UserId);
-                    DbScoped.SugarScope.GetConnection(0).QueryFilter.Add(filter1);
+                    var filter1 = new TableFilterItem<SysUser>(it => it.UserId == user.UserId, true);
+                    sqlSugarClient.QueryFilter.Add(filter1);
                 }
             }
         }

ZR.Admin.WebApi/ZR.Admin.WebApi.csproj

@@ -29,7 +29,6 @@
 		<PackageReference Include="NLog" Version="5.0.0-rc2" />
 		<PackageReference Include="NLog.Web.AspNetCore" Version="4.14.0" />
 		<PackageReference Include="Mapster" Version="7.3.0" />
-		<PackageReference Include="SqlSugar.IOC" Version="1.7.0" />
 		<PackageReference Include="EPPlus" Version="5.8.6" />
 		<PackageReference Include="Hei.Captcha" Version="0.3.0" />
 		<PackageReference Include="Snowflake.Core" Version="2.0.0" />

ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplService.txt

@@ -21,7 +21,7 @@ namespace ${options.ServicesNamespace}.${options.SubNamespace}
     public class ${replaceDto.ModelTypeName}Service : BaseService<${replaceDto.ModelTypeName}>, I${replaceDto.ModelTypeName}Service
     {
         private readonly ${replaceDto.ModelTypeName}Repository _${replaceDto.ModelTypeName}repository;
-        public ${replaceDto.ModelTypeName}Service(${replaceDto.ModelTypeName}Repository repository) : base(repository)
+        public ${replaceDto.ModelTypeName}Service(${replaceDto.ModelTypeName}Repository repository)
         {
             _${replaceDto.ModelTypeName}repository = repository;
         }

ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVueSelect.txt

@@ -11,11 +11,9 @@
     </el-form>
     <!-- 工具区域 -->
     <el-row :gutter="10" class="mb8">
-$if(replaceDto.ShowBtnExport)
       <el-col :span="1.5">
         <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" v-hasPermi="['${replaceDto.PermissionPrefix}:export']">导出</el-button>
       </el-col>
-$end
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -59,9 +57,7 @@ $end
 import { 
   list${genTable.BusinessName},
   get${genTable.BusinessName},
-$if(replaceDto.ShowBtnExport)
   export${genTable.BusinessName},
-$end
 } from '@/api/${tool.FirstLowerCase(genTable.ModuleName)}/${tool.FirstLowerCase(genTable.BusinessName)}.js';
 
 export default {