From 3c6c01cb7486030174aca9af0bd383c17e521666 Mon Sep 17 00:00:00 2001
From: zhichao lei <442149704@qq.com>
Date: Wed, 6 Jan 2021 15:11:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E6=96=87=E6=8E=A5=E6=94=B6=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=95=B0=E6=8D=AE=E8=A6=81=E5=88=A0=E9=99=A4=E5=AF=B9?=
 =?UTF-8?q?=E5=BA=94=E7=9A=84=E6=8E=A5=E6=94=B6=E5=85=AC=E6=96=87=E7=9A=84?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=EF=BC=8C=20=E5=B0=8F=E9=93=83=E9=93=9B=20?=
 =?UTF-8?q?=E5=85=AC=E5=91=8A=E8=B7=B3=E8=BD=AC=E9=A1=B5=E9=9D=A2=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/Home/AdminDefault/index.js               |  4 ++--
 .../Views/Home/AdminDefault/indexNavigation.js     |  4 ++--
 .../Sys_ReceiveDocumentService.cs                  | 14 +++++++++-----
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefault/index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefault/index.js
index 4b59e201f..05c07fee1 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefault/index.js	
+++ b/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'
                     });
                 });
 
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefault/indexNavigation.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefault/indexNavigation.js
index c0af6f26e..e73667066 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefault/indexNavigation.js	
+++ b/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'
                     });
                 });
 
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveDocument/Sys_ReceiveDocumentService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveDocument/Sys_ReceiveDocumentService.cs
index 4eceb999f..0421c322c 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveDocument/Sys_ReceiveDocumentService.cs	
+++ b/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;