wenyongda/ZrAdminNetCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增加本部门及以下数据过滤

Browse Source
This commit is contained in:
不做码农 2022-04-10 09:07:43 +08:00
parent ff83610714
commit 6967d2083f
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ZR.Admin.WebApi/Extensions/DbExtension.cs
View File

@ -48,7 +48,7 @@ namespace ZR.Admin.WebApi.Extensions
SugarIocServices.ConfigurationSugar(db => SugarIocServices.ConfigurationSugar(db =>
{ {
FilterData(0); FilterData(0);
FilterData(1); //FilterData(1);
#region db0 #region db0
db.GetConnection(0).Aop.OnLogExecuting = (sql, pars) => db.GetConnection(0).Aop.OnLogExecuting = (sql, pars) =>
{ {
@ -114,12 +114,19 @@ namespace ZR.Admin.WebApi.Extensions
} }
else if (DATA_SCOPE_DEPT.Equals(dataScope))//本部门数据 else if (DATA_SCOPE_DEPT.Equals(dataScope))//本部门数据
{ {
var filter1 = new TableFilterItem<SysDept>(it => it.DeptId == user.DeptId); var filter1 = new TableFilterItem<SysUser>(it => it.DeptId == user.DeptId);
db.QueryFilter.Add(filter1); db.QueryFilter.Add(filter1);
} }
else if (DATA_SCOPE_DEPT_AND_CHILD.Equals(dataScope))//本部门及以下数据 else if (DATA_SCOPE_DEPT_AND_CHILD.Equals(dataScope))//本部门及以下数据
{ {
//SQl OR {}.dept_id IN ( SELECT dept_id FROM sys_dept WHERE dept_id = {} or find_in_set( {} , ancestors ) ) //SQl OR {}.dept_id IN ( SELECT dept_id FROM sys_dept WHERE dept_id = {} or find_in_set( {} , ancestors ) )
var allChildDepts = db.Queryable<SysDept>().ToChildList(it => it.ParentId, user.DeptId);
var filter1 = new TableFilterItem<SysUser>(it => allChildDepts.Select(f => f.DeptId).ToList().Contains(it.DeptId));
db.QueryFilter.Add(filter1);
var filter2 = new TableFilterItem<SysDept>(it => allChildDepts.Select(f => f.DeptId).ToList().Contains(it.DeptId));
db.QueryFilter.Add(filter2);
} }
else if (DATA_SCOPE_SELF.Equals(dataScope))//仅本人数据 else if (DATA_SCOPE_SELF.Equals(dataScope))//仅本人数据
{ {

8
ZR.Vue/src/views/system/role/index.vue
View File

@ -211,10 +211,10 @@ export default {
dictValue: '3', dictValue: '3',
dictLabel: '本部门' dictLabel: '本部门'
}, },
// { {
// dictValue: "4", dictValue: "4",
// dictLabel: "本部门及以下数据权限", dictLabel: "本部门及以下数据权限",
// }, },
{ {
dictValue: '5', dictValue: '5',
dictLabel: '仅本人' dictLabel: '仅本人'