diff --git a/Api/Ewide.Application/Service/HouseSafety/HouseMember/HouseMemberService.cs b/Api/Ewide.Application/Service/HouseSafety/HouseMember/HouseMemberService.cs index 309d93b..5f68f22 100644 --- a/Api/Ewide.Application/Service/HouseSafety/HouseMember/HouseMemberService.cs +++ b/Api/Ewide.Application/Service/HouseSafety/HouseMember/HouseMemberService.cs @@ -82,7 +82,9 @@ WHERE 1=1"; if (!string.IsNullOrEmpty(input.SysEmpParam.OrgId)) { - sql += " AND (SO.Id = @OrgId OR SO.Pids Like CONCAT('%[', @OrgId, ']%'))"; + var filter = " AND (SO.Id = @OrgId {0}) "; + filter = String.Format(filter, input.TreeNodeDataScope.GetValueOrDefault(1) == 2 ? " OR SO.Pids Like CONCAT('%[', @OrgId, ']%') " : ""); + sql += filter; param.Add("OrgId", input.SysEmpParam.OrgId); } diff --git a/Api/Ewide.Core/Ewide.Core.xml b/Api/Ewide.Core/Ewide.Core.xml index 5d038ce..712fedc 100644 --- a/Api/Ewide.Core/Ewide.Core.xml +++ b/Api/Ewide.Core/Ewide.Core.xml @@ -2674,6 +2674,11 @@ 查询条件 + + + 树节点数据范围 (1"只看本级" 2"查看本级及以下") + + 小诺分页列表结果 diff --git a/Api/Ewide.Core/Extension/InputBase.cs b/Api/Ewide.Core/Extension/InputBase.cs index 0b86364..1911128 100644 --- a/Api/Ewide.Core/Extension/InputBase.cs +++ b/Api/Ewide.Core/Extension/InputBase.cs @@ -76,6 +76,11 @@ namespace Ewide.Core /// 查询条件 /// public virtual SearchInfo[] SearchInfo { get; set; } + + /// + /// 树节点数据范围 (1"只看本级" 2"查看本级及以下") + /// + public virtual int? TreeNodeDataScope { get; set; } } } diff --git a/web-react/src/pages/business/house/member/form.jsx b/web-react/src/pages/business/house/member/form.jsx index db24377..262d9fd 100644 --- a/web-react/src/pages/business/house/member/form.jsx +++ b/web-react/src/pages/business/house/member/form.jsx @@ -256,11 +256,32 @@ export default class form extends Component { - + - - + + diff --git a/web-react/src/pages/business/house/member/index.jsx b/web-react/src/pages/business/house/member/index.jsx index e5b64d0..02dd057 100644 --- a/web-react/src/pages/business/house/member/index.jsx +++ b/web-react/src/pages/business/house/member/index.jsx @@ -339,13 +339,27 @@ export default class index extends Component { > {this.state.codes.commonStatus.map(item => { return ( - + {item.value} ) })} + + + } operator={ diff --git a/web-react/src/pages/system/user/form.jsx b/web-react/src/pages/system/user/form.jsx index 8504d3a..a33b5ed 100644 --- a/web-react/src/pages/system/user/form.jsx +++ b/web-react/src/pages/system/user/form.jsx @@ -350,10 +350,31 @@ export default class form extends Component { - + - +