Merge branch 'master' of http://git.fwt.com/Hotline/hotline

src/Hotline.Api/appsettings.Development.json

@@ -48,7 +48,7 @@
     "Expired": 86300 //认证过期时间（秒）
   },
   "ConnectionStrings": {
-    "Hotline": "server=db.fengwo.com;Database=hotline;Uid=dev;Pwd=fengwo11!!;SslMode=none;",
+    "Hotline": "server=192.168.100.121;Database=hotline;Uid=dev;Pwd=fengwo11!!;SslMode=none;",
     "Redis": "192.168.100.223:6379",
     "MongoDB": "mongodb://192.168.100.121:27017"
   },

src/Hotline.Repository.SqlSugar/DataPermissions/DataPermissionManager.cs

@@ -22,6 +22,7 @@ public class DataPermissionManager : IDataPermissionManager, IScopeDependency
     public DataPermissionScheme GetQueryFilter<TEntity>(ISessionContext sessionContext) where TEntity : class, IEntity<string>, IDataPermission, new()
     {
         EAuthorityType? queryFilter = GetCurrentQueryFilter(sessionContext.Roles, typeof(TEntity).Name);
+
         if (queryFilter == null)
         {
             
@@ -54,28 +55,28 @@ public class DataPermissionManager : IDataPermissionManager, IScopeDependency
     public (string orgId,string departmentCode, string creatorId, string? areaId) GetDataPermissionOptions()
     {
         using var scope = _serviceScopeFactory.CreateScope();
-        var userRepository = scope.ServiceProvider.GetService<IUserRepository>();
-        var user = userRepository!.GetAsync(_sessionContext.RequiredUserId).Result;
+        var userRepository = scope.ServiceProvider.GetRequiredService<IUserRepository>();
+        var user = userRepository.GetAsync(_sessionContext.RequiredUserId).GetAwaiter().GetResult();
         if (!string.IsNullOrEmpty(user!.OrgId))
         {
-            var orgRepository = scope.ServiceProvider.GetService<ISystemOrganizeRepository>();
-            var org = orgRepository!.GetAsync(user!.OrgId).Result;
+            var orgRepository = scope.ServiceProvider.GetRequiredService<ISystemOrganizeRepository>();
+            var org = orgRepository!.GetAsync(user!.OrgId).GetAwaiter().GetResult();
 
             return (org!.Id, org.OrgCode, _sessionContext.RequiredUserId, org.OrgCode);
         }
         return ("", "", _sessionContext.RequiredUserId, "");
     }
 
-    private EAuthorityType? GetCurrentQueryFilter(string[] roles, string entityName)
+    private EAuthorityType GetCurrentQueryFilter(string[] roles, string entityName)
     {
         using var scope = _serviceScopeFactory.CreateScope();
-        var systemDataTableRepository = scope.ServiceProvider.GetService<ISystemDataTableRepository>();
-        var systemDataAuthorityRepository = scope.ServiceProvider.GetService<ISystemDataAuthorityRepository>();
+        var systemDataTableRepository = scope.ServiceProvider.GetRequiredService<ISystemDataTableRepository>();
+        var systemDataAuthorityRepository = scope.ServiceProvider.GetRequiredService<ISystemDataAuthorityRepository>();
 
         ////查询对应表配置
-        var tableModel = systemDataTableRepository!.GetAsync(x => x.EntityName == entityName).Result;
+        var tableModel = systemDataTableRepository.GetAsync(x => x.EntityName == entityName).GetAwaiter().GetResult();
         ////查询表对应最高数据权限
-        var auth = systemDataAuthorityRepository!.GetMyTopDataAuth(roles, tableModel!.Id);
+        var auth = systemDataAuthorityRepository.GetMyTopDataAuth(roles, tableModel!.Id);
         return auth;
     }
 }

src/Hotline.Repository.SqlSugar/Orders/HotSpotTypeRepository.cs

@@ -0,0 +1,15 @@
+using Hotline.CallCenter.BlackLists;
+using Hotline.Orders;
+using Hotline.Repository.SqlSugar.DataPermissions;
+using SqlSugar;
+using XF.Domain.Dependency;
+
+namespace Hotline.Repository.SqlSugar.Orders
+{
+    public class HotSpotTypeRepository : BaseRepository<HotSpotType>, IHotSpotTypeRepository, IScopeDependency
+    {
+        public HotSpotTypeRepository(ISugarUnitOfWork<HotlineDbContext> uow, IDataPermissionFilterBuilder dataPermissionFilterBuilder) : base(uow, dataPermissionFilterBuilder)
+        {
+        }
+    }
+}

src/Hotline.Repository.SqlSugar/System/SystemDataAuthorityRepository.cs

@@ -12,7 +12,7 @@ namespace Hotline.Repository.SqlSugar.System
         {
         }
 
-        public EAuthorityType? GetMyTopDataAuth(string[] roles,string tableid)
+        public EAuthorityType GetMyTopDataAuth(string[] roles,string tableid)
         {
             var dataAuth =Db.Queryable<SystemDataAuthority>().Where(x => roles.Contains(x.RoleCode) && x.TableId == tableid).Min(x=>x.AuthorityType);
             return dataAuth;

src/Hotline/Orders/HotSpotType.cs

@@ -0,0 +1,26 @@
+
+using SqlSugar;
+using XF.Domain.Repository;
+
+namespace Hotline.Orders
+{
+    /// <summary>
+    /// 热点基础数据
+    /// </summary>
+    [SugarIndex("unique_hotspottype_name", nameof(HotSpotType.HotSpotName), OrderByType.Desc, true)]
+    public class HotSpotType: CreationSoftDeleteEntity
+    {
+        public string HotSpotName { get; set; }
+        [SugarColumn(IsNullable = true)]
+        public string ParentId { get; set; }
+        public string PYCode { get; set; }
+        public string FullPYCode { get; set; }
+        public string ProvinceCode { get; set; }
+        public int OrderBy { get; set; }
+        public string TrunkNum { get; set; }
+        /// <summary>
+        /// 生成的时候写入
+        /// </summary>
+        public string HotSpotFullName { get; set; }
+    }
+}

src/Hotline/Orders/IHotSpotTypeRepository.cs

@@ -0,0 +1,9 @@
+using XF.Domain.Repository;
+
+namespace Hotline.Orders
+{
+    public interface IHotSpotTypeRepository : IRepository<HotSpotType>
+    {
+
+    }
+}

src/Hotline/Settings/ISystemDataAuthorityRepository.cs

@@ -5,6 +5,6 @@ namespace Hotline.Settings
 {
     public interface ISystemDataAuthorityRepository : IRepository<SystemDataAuthority>
     {
-        EAuthorityType? GetMyTopDataAuth(string[] roles, string tableid);
+        EAuthorityType GetMyTopDataAuth(string[] roles, string tableid);
     }
 }