From e8d58165a6b6b283e5c79277fab1d340d167a555 Mon Sep 17 00:00:00 2001
From: liangkun <liangkun7173@hotmail.com>
Date: Wed, 23 Sep 2020 15:30:56 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DataAuthorize/DataAuthorizeBLL.cs              | 14 +++++++++++++-
 .../SystemModule/Interface/InterfaceBLL.cs         |  5 ++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/AuthorizeModule/DataAuthorize/DataAuthorizeBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/AuthorizeModule/DataAuthorize/DataAuthorizeBLL.cs
index 9cb0cf89d..4d9dec5ce 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/AuthorizeModule/DataAuthorize/DataAuthorizeBLL.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/AuthorizeModule/DataAuthorize/DataAuthorizeBLL.cs	
@@ -257,7 +257,19 @@ namespace Learun.Application.Base.AuthorizeModule
                 }
                 else
                 {
-                    relationListId = url;
+                    //liangkun 20200923修改
+                    //自定义表单也需要增加数据权限验证功能
+                    //relationListId = url;
+                    InterfaceEntity interfaceEntity = interfaceIBLL.GetEntityByUrl("/LR_FormModule/FormRelation/PreviewIndex?id=" + url);
+                    if (interfaceEntity == null)
+                    {
+                        // 如果接口没有注册则不作过滤
+                        return true;
+                    }
+                    else
+                    {
+                        relationListId = interfaceEntity.F_Id;
+                    }
                 }
 
                 List<DataAuthorizeRelationEntity> relationList = (List<DataAuthorizeRelationEntity>)GetRelationList(relationListId);
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/Interface/InterfaceBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/Interface/InterfaceBLL.cs
index 8eba7ed1d..373f32337 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/Interface/InterfaceBLL.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/Interface/InterfaceBLL.cs	
@@ -148,7 +148,10 @@ namespace Learun.Application.Base.SystemModule
             {
                 if (url.Contains("?"))
                 {
-                    url = url.Substring(0, url.IndexOf('?'));
+                    if (!url.Contains("/LR_FormModule/FormRelation/PreviewIndex"))
+                    {
+                        url = url.Substring(0, url.IndexOf('?'));
+                    }
                 }
                 List<InterfaceEntity> list = GetList();
                 return list.Find(t => t.F_Address == url);