From 5f8196ee33cadf6ba70bcd83c10441cfc1f5bfe3 Mon Sep 17 00:00:00 2001
From: zhangli <1109134334@qq.com>
Date: Wed, 16 Mar 2022 23:18:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B6=88=E6=81=AF=E6=8F=90?=
 =?UTF-8?q?=E9=86=92=E6=B2=A1=E6=9C=89=E5=AE=9E=E4=BE=8BId=E6=97=B6?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/MessageRind/UnreadIndex.cshtml      | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/MessageRind/UnreadIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/MessageRind/UnreadIndex.cshtml
index c970e5dc8..fc58394a0 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/MessageRind/UnreadIndex.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/MessageRind/UnreadIndex.cshtml	
@@ -39,7 +39,7 @@
     "~/Areas/LR_Desktop/Views/MessageRind/Index.js"
     )
 
-<script type='text/javascript'>
+    <script type='text/javascript'>
     var name = '@(ViewBag.Name)';
     $(document).ready(function () {
         getdata();
@@ -83,7 +83,6 @@
         $('#uldata .lr-item').on('click', function () {
             var $obj = $(this);
             var params = ($obj.attr('id')).split('、');
-
             //更改状态为已读
             var MessageId = params[2];
             if (top.learun.checkrow(MessageId)) {
@@ -93,28 +92,31 @@
                     data: { keyValue: MessageId },
                     dataType: "json",
                     async: false,
-                    success: function (data) {
+                    success: function(data) {
                         //弹窗查看详情
                         var keyValue = params[1];
                         var ConnectionUrl = params[3];
                         var title = params[0];
-                        if (top.learun.checkrow(keyValue)) {
+                        if (!!ConnectionUrl) {
+                            var url = top.$.rootUrl + ConnectionUrl;
+                            if (!!keyValue && keyValue != 'null' && keyValue != 'undefined') {
+                                url += keyValue;
+                            }
                             top.learun.layerForm({
                                 id: 'formview',
                                 title: title,
-                                url: top.$.rootUrl + ConnectionUrl + keyValue,
+                                url: url,
                                 width: 1000,
                                 height: 650,
                                 maxmin: true,
                                 btn: null,
                             });
 
-                        }
+                        } 
+
                     }
                 })
-            }
-
-
+            } 
         });
     });
 
@@ -136,6 +138,6 @@
 
     //}
 
-</script>
+    </script>
 </body>
 </html>