From 3e6d2fdce17206981b97e3de8f53f8d5a877d725 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Fri, 18 Mar 2022 21:49:58 +0800
Subject: [PATCH] update DbExtension.cs

---
 ZR.Admin.WebApi/Extensions/DbExtension.cs | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/ZR.Admin.WebApi/Extensions/DbExtension.cs b/ZR.Admin.WebApi/Extensions/DbExtension.cs
index f05502e1..acf8bbc7 100644
--- a/ZR.Admin.WebApi/Extensions/DbExtension.cs
+++ b/ZR.Admin.WebApi/Extensions/DbExtension.cs
@@ -52,7 +52,7 @@ namespace ZR.Admin.WebApi.Extensions
                 {
                     var param = db.Utilities.SerializeObject(pars.ToDictionary(it => it.ParameterName, it => it.Value));
 
-                    FilterData();
+                    FilterData(db.GetConnection(0));
 
                     logger.Info($"【sql语句】{sql}，{param}");
                 };
@@ -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);
                 }
             }
         }