innov
/
BootstrapAdmin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat(#IWCX5): 演示模式下禁止修改测试平台相关配置数据 

#Comment
comment #IWCX5

#Issue
close https://gitee.com/LongbowEnterprise/dashboard/issues?id=IWCX5
This commit is contained in:
Argo Zhang 2019-05-09 13:16:14 +08:00
parent 8719b50f32
commit 53e35fd789
1 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Bootstrap.DataAccess/Helper/DictHelper.cs
View File

@ -1,4 +1,4 @@
using Bootstrap.Security; using Bootstrap.Security;
using Longbow.Cache; using Longbow.Cache;
using Longbow.Data; using Longbow.Data;
using Longbow.Web; using Longbow.Web;
@ -32,6 +32,8 @@ namespace Bootstrap.DataAccess
/// <returns></returns> /// <returns></returns>
public static IEnumerable<BootstrapDict> RetrieveDicts() => CacheManager.GetOrAdd(RetrieveDictsDataKey, key => DbContextManager.Create<Dict>().RetrieveDicts()); public static IEnumerable<BootstrapDict> RetrieveDicts() => CacheManager.GetOrAdd(RetrieveDictsDataKey, key => DbContextManager.Create<Dict>().RetrieveDicts());
private static IEnumerable<BootstrapDict> RetrieveProtectedDicts() => RetrieveDicts().Where(d => d.Define == 0 || d.Category == "测试平台");
/// <summary> /// <summary>
/// 删除字典中的数据 /// 删除字典中的数据
/// </summary> /// </summary>
@ -41,8 +43,8 @@ namespace Bootstrap.DataAccess
{ {
if (RetrieveSystemModel()) if (RetrieveSystemModel())
{ {
// 允许删除自定义数据字典 // 禁止删除系统数据与测试平台数据
var systemDicts = RetrieveDicts().Where(d => d.Define == 0); var systemDicts = RetrieveProtectedDicts();
value = value.Where(v => !systemDicts.Any(d => d.Id == v)); value = value.Where(v => !systemDicts.Any(d => d.Id == v));
if (!value.Any()) return true; if (!value.Any()) return true;
} }
@ -58,20 +60,8 @@ namespace Bootstrap.DataAccess
/// <returns></returns> /// <returns></returns>
public static bool Save(BootstrapDict p) public static bool Save(BootstrapDict p)
{ {
if (RetrieveSystemModel()) if (RetrieveSystemModel() && RetrieveProtectedDicts().Any(m => m.Id == p.Id)) return true;
{
if (string.IsNullOrEmpty(p.Id))
{
if (p.Define == 0) p.Define = 1;
}
else
{
if (RetrieveDicts().Where(m => m.Define == 0).Any(m => m.Id == p.Id))
{
return true;
}
}
}
var ret = DbContextManager.Create<Dict>().Save(p); var ret = DbContextManager.Create<Dict>().Save(p);
if (ret) CacheCleanUtility.ClearCache(dictIds: new List<string>()); if (ret) CacheCleanUtility.ClearCache(dictIds: new List<string>());
return ret; return ret;