From 249007c237fc62cae87bed0635367132306c5ac5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=87=AA=E5=B8=A6=E5=A4=A7=E4=BD=AC=E6=B0=94=E5=9C=BA?= <188633308@qq.com> Date: Wed, 26 May 2021 17:27:31 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E5=8E=BB=E9=99=A4=E4=BA=86=E5=BC=80?= =?UTF-8?q?=E5=8F=91=E6=A8=A1=E5=BC=8F=E4=B8=8B=E7=9A=84=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Api/Ewide.Core/Service/Area/AreaCodeService.cs | 15 +++++++++++++++ Api/Ewide.Core/Service/Config/SysConfigService.cs | 6 ++++++ Api/Ewide.Core/Service/Menu/SysMenuService.cs | 3 +++ Api/Ewide.Core/Service/Org/SysOrgService.cs | 5 ++++- Api/Ewide.Core/Service/User/SysUserService.cs | 3 +++ Api/Ewide.Core/applicationconfig.json | 1 + 6 files changed, 32 insertions(+), 1 deletion(-) diff --git a/Api/Ewide.Core/Service/Area/AreaCodeService.cs b/Api/Ewide.Core/Service/Area/AreaCodeService.cs index 7c969ec..c076a67 100644 --- a/Api/Ewide.Core/Service/Area/AreaCodeService.cs +++ b/Api/Ewide.Core/Service/Area/AreaCodeService.cs @@ -35,7 +35,10 @@ namespace Ewide.Core.Service.Area CheckCode(input); CheckArea(input); await _areaCodeRep.InsertNowAsync(input.Adapt()); +#if DEBUG +#else await _sysCacheService.SetAreaCode(await _areaCodeRep.DetachedEntities.ToListAsync()); +#endif } /// /// 删除一个区域 @@ -50,7 +53,10 @@ namespace Ewide.Core.Service.Area throw Oops.Oh("不能删除已包含区域的组织"); } await AreaCode.DeleteNowAsync(); +#if DEBUG +#else await _sysCacheService.SetAreaCode(await _areaCodeRep.DetachedEntities.ToListAsync()); +#endif } /// /// 根据区域代码获取区域信息 @@ -63,7 +69,10 @@ namespace Ewide.Core.Service.Area if (cachedAreaCodes == null || cachedAreaCodes.Count < 0) { cachedAreaCodes = await _areaCodeRep.DetachedEntities.ToListAsync(); +#if DEBUG +#else await _sysCacheService.SetAreaCode(cachedAreaCodes); +#endif } return cachedAreaCodes.FirstOrDefault(a => a.Code == code); } @@ -78,7 +87,10 @@ namespace Ewide.Core.Service.Area if (cachedAreaCodes == null || cachedAreaCodes.Count < 0) { cachedAreaCodes = await _areaCodeRep.DetachedEntities.ToListAsync(); +#if DEBUG +#else await _sysCacheService.SetAreaCode(cachedAreaCodes); +#endif } cachedAreaCodes = cachedAreaCodes.Where(p => p.LevelType <= level).ToList(); return new TreeBuildUtil().DoTreeBuild(cachedAreaCodes.Select(u => new AreaTreeNode @@ -120,7 +132,10 @@ namespace Ewide.Core.Service.Area CheckArea(input); var area = input.Adapt(); await area.UpdateNowAsync(); +#if DEBUG +#else await _sysCacheService.SetAreaCode(await _areaCodeRep.DetachedEntities.ToListAsync()); +#endif } private bool CheckInput(AreaCodeInput input) { diff --git a/Api/Ewide.Core/Service/Config/SysConfigService.cs b/Api/Ewide.Core/Service/Config/SysConfigService.cs index ea576bb..62c0714 100644 --- a/Api/Ewide.Core/Service/Config/SysConfigService.cs +++ b/Api/Ewide.Core/Service/Config/SysConfigService.cs @@ -129,7 +129,10 @@ namespace Ewide.Core.Service { var config = await _sysConfigRep.DetachedEntities.FirstOrDefaultAsync(u => u.Code == code); value = config != null ? config.Value : ""; +#if DEBUG +#else await _sysCacheService.SetAsync(code, value); +#endif } return value; } @@ -142,7 +145,10 @@ namespace Ewide.Core.Service /// public async Task UpdateConfigCache(string code, object value) { +#if DEBUG +#else await _sysCacheService.SetAsync(code, value); +#endif } /// diff --git a/Api/Ewide.Core/Service/Menu/SysMenuService.cs b/Api/Ewide.Core/Service/Menu/SysMenuService.cs index c319fd4..c2bb3f3 100644 --- a/Api/Ewide.Core/Service/Menu/SysMenuService.cs +++ b/Api/Ewide.Core/Service/Menu/SysMenuService.cs @@ -56,7 +56,10 @@ namespace Ewide.Core.Service .Where(u => u.Type == (int)MenuType.BTN) .Where(u => u.Status == (int)CommonStatus.ENABLE) .Select(u => u.Permission).ToListAsync(); +#if DEBUG +#else await _sysCacheService.SetPermission(userId, permissions); // 缓存结果 +#endif } return permissions; } diff --git a/Api/Ewide.Core/Service/Org/SysOrgService.cs b/Api/Ewide.Core/Service/Org/SysOrgService.cs index 6e1cee8..812ab4c 100644 --- a/Api/Ewide.Core/Service/Org/SysOrgService.cs +++ b/Api/Ewide.Core/Service/Org/SysOrgService.cs @@ -90,9 +90,12 @@ namespace Ewide.Core.Service var parentAndChildIdListWithSelf = sysOrg.Pids.TrimEnd(',').Replace("[", "").Replace("]", "") .Split(",").ToList(); dataScopeList.AddRange(parentAndChildIdListWithSelf); + + // 添加本级(不知道为什么框架在这里排除了本级) + dataScopeList.Add(u); }); } - return dataScopeList; + return dataScopeList.Distinct().ToList(); } /// diff --git a/Api/Ewide.Core/Service/User/SysUserService.cs b/Api/Ewide.Core/Service/User/SysUserService.cs index 880b61e..913e0e8 100644 --- a/Api/Ewide.Core/Service/User/SysUserService.cs +++ b/Api/Ewide.Core/Service/User/SysUserService.cs @@ -395,7 +395,10 @@ namespace Ewide.Core.Service dataScopes = userDataScopeIdListForUser.Concat(userDataScopeIdListForRole).Distinct().ToList(); // 并集 +#if DEBUG +#else await _sysCacheService.SetDataScope(userId, dataScopes); // 缓存结果 +#endif } return dataScopes; } diff --git a/Api/Ewide.Core/applicationconfig.json b/Api/Ewide.Core/applicationconfig.json index 19135e6..75c843d 100644 --- a/Api/Ewide.Core/applicationconfig.json +++ b/Api/Ewide.Core/applicationconfig.json @@ -84,6 +84,7 @@ "getLoginUser", "logout", "sysDictType:dropDown", + "sysDictType:dropDowns", "sysFileInfo:upload", "sysFileInfo:download", "sysFileInfo:preview",