合并

BPA.SAAS.Manage.Application/AExternalPlatform/BaseDto/UserAnalysis.cs

@@ -1,4 +1,5 @@
-using BPA.SAAS.Manage.Core;
+using BPA.SAAS.KitChenManage.Core;
+using BPA.SAAS.Manage.Core;
 using Furion;
 using Microsoft.AspNetCore.Http;
 using System;

BPA.SAAS.Manage.Application/AExternalPlatform/Service/CheckService/Services/CheckServices.cs

@@ -10,6 +10,8 @@ using System.Linq;
 using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
+using BPA.SAAS.KitChenManage.Core;
+using BPA.KitChen.GroupMeal.SqlSugar;
 
 namespace BPA.SAAS.Manage.Application.AExternalPlatform.Service.CheckService.Services
 {

BPA.SAAS.Manage.Application/AExternalPlatform/Service/Material/Services/MaterialService.cs

@@ -1,4 +1,6 @@
-using BPA.SAAS.Manage.Application.AExternalPlatform.BaseDto;
+using BPA.KitChen.GroupMeal.SqlSugar;
+using BPA.SAAS.KitChenManage.Core;
+using BPA.SAAS.Manage.Application.AExternalPlatform.BaseDto;
 using BPA.SAAS.Manage.Application.AExternalPlatform.Enum;
 using BPA.SAAS.Manage.Application.AExternalPlatform.Service.CheckService.Services;
 using BPA.SAAS.Manage.Application.AExternalPlatform.Service.Material.Dtos;

BPA.SAAS.Manage.Core/Base/PageUtil.cs

@@ -23,6 +23,9 @@ namespace BPA.SAAS.Manage.Core.Base
         public int Total { get; set; }
     }
 
+    /// <summary>
+    /// 分页实体
+    /// </summary>
     public class PageUtil<T>
     {
         /// <summary>

BPA.SAAS.Manage.Core/CurrentUser.cs

@@ -4,12 +4,12 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace BPA.SAAS.Manage.Core
+namespace BPA.SAAS.KitChenManage.Core
 {
     public static class CurrentUser
     {
         public static string GroupId { get; set; }
 
-        public static string Key { get; set; }
+        public static string key { get; set; }
     }
 }

BPA.SAAS.Manage.Core/SqlSugarDb.cs

@@ -1,8 +1,14 @@
-using BPA.SAAS.Manage.Core.Base;
+
+using BPA.SAAS.KitChenManage.Core;
+using BPA.SAAS.Manage.Core.Base;
+using Furion;
 using SqlSugar;
 using System;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Reflection;
 
-namespace BPA.SAAS.Manage.Core
+namespace BPA.KitChen.GroupMeal.SqlSugar
 {
     public class SqlSugarDb
     {
@@ -45,7 +51,6 @@ namespace BPA.SAAS.Manage.Core
 
             //添加默认值
             DataExecuting(db);
-            db.QueryFilter.AddTableFilter<IGroupId>(it => it.GroupId == CurrentUser.GroupId);
         }
 
         /// <summary>