公文接收删除数据要删除对应的接收公文的数据， 小铃铛 公告跳转页面修改

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefault/index.js

@@ -614,8 +614,8 @@ var bootstrap = function ($, learun) {
                     learun.frameTab.open({
                         F_ModuleId: '103',
                         F_Icon: 'fa fa-user',
-                        F_FullName: '下发通知公告',
-                        F_UrlAddress: '/LR_OAModule/Notice/Index'
+                        F_FullName: '查看通知公告',
+                        F_UrlAddress: '/LR_OAModule/Notice/ViewIndex'
                     });
                 });
 

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefault/indexNavigation.js

@@ -609,8 +609,8 @@ var bootstrap = function ($, learun) {
                     learun.frameTab.open({
                         F_ModuleId: '103',
                         F_Icon: 'fa fa-user',
-                        F_FullName: '下发通知公告',
-                        F_UrlAddress: '/LR_OAModule/Notice/Index'
+                        F_FullName: '查看通知公告',
+                        F_UrlAddress: '/LR_OAModule/Notice/ViewIndex'
                     });
                 });
 

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveDocument/Sys_ReceiveDocumentService.cs

@@ -73,13 +73,13 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     dp.Add("RTitle", "%" + queryParam["RTitle"].ToString() + "%", DbType.String);
                     strSql.Append(" AND t.RTitle Like @RTitle ");
                 }
-                var list= this.BaseRepository().FindList<Sys_ReceiveDocumentEntity>(strSql.ToString(), dp, pagination);
+                var list = this.BaseRepository().FindList<Sys_ReceiveDocumentEntity>(strSql.ToString(), dp, pagination);
                 foreach (var item in list)
                 {
-                    if(!item.RSendFlag.Equals("4"))
+                    if (!item.RSendFlag.Equals("4"))
                     {
-                        var listentity=this.BaseRepository().FindList<Sys_ReceiveFileEntity>(a => a.SFileId == item.RID && a.RStatus==0).Count();
-                        if(listentity>0)
+                        var listentity = this.BaseRepository().FindList<Sys_ReceiveFileEntity>(a => a.SFileId == item.RID && a.RStatus == 0).Count();
+                        if (listentity > 0)
                         {
                             item.HasDispose = 1;
                         }
@@ -165,12 +165,16 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <returns></returns>
         public void DeleteEntity(string keyValue)
         {
+            var db = this.BaseRepository().BeginTrans();
             try
             {
-                this.BaseRepository().Delete<Sys_ReceiveDocumentEntity>(t => t.RID == keyValue);
+                db.Delete<Sys_ReceiveDocumentEntity>(t => t.RID == keyValue);
+                db.Delete<Sys_ReceiveFileEntity>(a => a.SFileId == keyValue);
+                db.Commit();
             }
             catch (Exception ex)
             {
+                db.Rollback();
                 if (ex is ExceptionEx)
                 {
                     throw;