修改表单发布功能权限判断

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Controllers/FormRelationController.cs

@@ -66,7 +66,7 @@ namespace Learun.Application.Web.Areas.LR_FormModule.Controllers
         public ActionResult PreviewIndex(string id)
         {
             string currentUrl = (string)WebHelper.GetHttpItems("currentUrl");
-            currentUrl = currentUrl + "?id=" + id;
+            //currentUrl = currentUrl + "?id=" + id;
             WebHelper.UpdateHttpItem("currentUrl", currentUrl);
 
             return View();

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/PreviewIndex.js

@@ -294,7 +294,7 @@ var bootstrap = function ($, learun) {
                 girdurl = top.$.rootUrl + '/LR_FormModule/FormRelation/GetPreviewList?keyValue=' + id;
             }
 
-            $('#gridtable').lrAuthorizeJfGrid({
+            $('#gridtable').jfGrid({
                 url: girdurl,
                 headData: headData,
                 reloadSelected: true,

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/Module/ModuleBLL.cs

@@ -80,7 +80,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<ModuleEntity> list = GetModuleList();
                 return list.Find(t => t.F_UrlAddress == url);
@@ -105,7 +108,8 @@ namespace Learun.Application.Base.SystemModule
         {
             List<ModuleEntity> modulelist = GetModuleList();
             List<TreeModel> treeList = new List<TreeModel>();
-            foreach (var item in modulelist) {
+            foreach (var item in modulelist)
+            {
                 TreeModel node = new TreeModel();
                 node.id = item.F_ModuleId;
                 node.text = item.F_FullName;
@@ -263,9 +267,10 @@ namespace Learun.Application.Base.SystemModule
             try
             {
                 List<ModuleButtonEntity> list = cache.Read<List<ModuleButtonEntity>>(cacheKeyBtn + moduleId, CacheId.module);
-                if (list == null) {
-                   list = (List<ModuleButtonEntity>)moduleService.GetButtonList(moduleId);
-                   cache.Write<List<ModuleButtonEntity>>(cacheKeyBtn + moduleId, list, CacheId.module);
+                if (list == null)
+                {
+                    list = (List<ModuleButtonEntity>)moduleService.GetButtonList(moduleId);
+                    cache.Write<List<ModuleButtonEntity>>(cacheKeyBtn + moduleId, list, CacheId.module);
                 }
                 UserInfo userInfo = LoginUserInfo.Get();
                 /*关联权限*/
@@ -275,7 +280,7 @@ namespace Learun.Application.Base.SystemModule
                     List<string> itemIdList = authorizeIBLL.GetItemIdListByobjectIds(objectIds, 2);
                     list = list.FindAll(t => itemIdList.IndexOf(t.F_ModuleButtonId) >= 0);
                 }
-                return list; 
+                return list;
             }
             catch (Exception ex)
             {
@@ -391,7 +396,7 @@ namespace Learun.Application.Base.SystemModule
                     list = list.FindAll(t => itemIdList.IndexOf(t.F_ModuleColumnId) >= 0);
                 }
 
-                return list; 
+                return list;
             }
             catch (Exception ex)
             {