From 3ff36f7ba6d0abcd4204b832317c77d6121d000b Mon Sep 17 00:00:00 2001 From: zhangli <1109134334@qq.com> Date: Fri, 8 Apr 2022 12:05:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=88=E6=9D=83=E5=88=B0=E6=9C=9F=E5=89=8D?= =?UTF-8?q?=E5=8F=91=E9=80=81=E9=82=AE=E4=BB=B6=E5=B9=B6=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=B7=B2=E5=8F=91=E9=80=81=E7=9A=84=E9=82=AE=E4=BB=B6=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/ShowAuthorizeController.cs | 2 +- .../Controllers/HomeController.cs | 7 +++ .../Controllers/LoginController.cs | 7 +++ .../XmlConfig/system.config | 8 +-- .../{LR_Desktop => LR_OA}/ShowAuthorizeMap.cs | 2 +- .../Learun.Application.Mapping.csproj | 2 +- .../Email/EmailSend/EmailSendBLL.cs | 51 +++++++++++++++++++ .../Email/EmailSend/EmailSendEntity.cs | 3 +- .../Email/EmailSend/EmailSendIBLL.cs | 1 + .../Email/EmailSend/EmailSendService.cs | 24 +++++++++ .../Learun.Application.OA.csproj | 4 ++ .../ShowAuthorize/ShowAuthorizeBLL.cs | 2 +- .../ShowAuthorize/ShowAuthorizeEntity.cs | 2 +- .../ShowAuthorize/ShowAuthorizeIBLL.cs | 2 +- .../ShowAuthorize/ShowAuthorizeService.cs | 14 ++--- .../Learun.Application.TwoDevelopment.csproj | 4 -- 16 files changed, 113 insertions(+), 22 deletions(-) rename Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/{LR_Desktop => LR_OA}/ShowAuthorizeMap.cs (93%) rename Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/{Learun.Application.TwoDevelopment/LR_Desktop => Learun.Application.OA}/ShowAuthorize/ShowAuthorizeBLL.cs (98%) rename Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/{Learun.Application.TwoDevelopment/LR_Desktop => Learun.Application.OA}/ShowAuthorize/ShowAuthorizeEntity.cs (97%) rename Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/{Learun.Application.TwoDevelopment/LR_Desktop => Learun.Application.OA}/ShowAuthorize/ShowAuthorizeIBLL.cs (96%) rename Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/{Learun.Application.TwoDevelopment/LR_Desktop => Learun.Application.OA}/ShowAuthorize/ShowAuthorizeService.cs (85%) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/ShowAuthorizeController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/ShowAuthorizeController.cs index 9f2a29424..4872dfa64 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/ShowAuthorizeController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/ShowAuthorizeController.cs @@ -1,8 +1,8 @@ using Learun.Util; using System.Data; -using Learun.Application.TwoDevelopment.LR_Desktop; using System.Web.Mvc; using System.Collections.Generic; +using Learun.Application.OA; namespace Learun.Application.Web.Areas.LR_Desktop.Controllers { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/HomeController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/HomeController.cs index dc4be320b..102bcaa21 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/HomeController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/HomeController.cs @@ -17,6 +17,7 @@ using Learun.Application.OA; using Learun.Application.TwoDevelopment.LR_Desktop; using Learun.Application.TwoDevelopment.Permission; using Learun.Application.WorkFlow; +using Learun.Application.OA.Email.EmailSend; namespace Learun.Application.Web.Controllers { @@ -58,6 +59,7 @@ namespace Learun.Application.Web.Controllers private Perm_FunctionIBLL perm_FunctionIBLL = new Perm_FunctionBLL(); private ICache redisCache = CacheFactory.CaChe(); private Sys_DefaultPwdConfigIBLL sys_DefaultPwdConfigIBLL = new Sys_DefaultPwdConfigBLL(); + private EmailSendIBLL emailSendIBLL = new EmailSendBLL(); #region 视图功能 public ActionResult ChangePwd() @@ -429,6 +431,11 @@ namespace Learun.Application.Web.Controllers { //授权验证 var lc = LicenseChecker.CheckLicense(); + //授权到期前发送邮件提醒 + if (!string.IsNullOrEmpty(lc.ExpirationDate)&&!lc.ExpirationDate.Contains("永久有效")) + { + emailSendIBLL.Send(lc.ExpirationDate); + } if (!lc.Result) { return Content(""); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/LoginController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/LoginController.cs index b6ad3a64e..43c4551ac 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/LoginController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/LoginController.cs @@ -17,6 +17,7 @@ using System.Web; using Quanjiang.DigitalScholl.WebLicense; using Learun.Application.TwoDevelopment.EducationalAdministration; using Newtonsoft.Json; +using Learun.Application.OA.Email.EmailSend; namespace Learun.Application.Web.Controllers { @@ -39,6 +40,7 @@ namespace Learun.Application.Web.Controllers private AnnexesFileIBLL annexesFileIbll = new AnnexesFileBLL(); WeChatDevelopIBLL weChatDevelopIbll = new WeChatDevelopBLL(); private Sys_DefaultPwdConfigIBLL Sys_DefaultPwdConfigIbll = new Sys_DefaultPwdConfigBLL(); + private EmailSendIBLL emailSendIBLL = new EmailSendBLL(); #endregion #region 视图功能 @@ -182,6 +184,11 @@ namespace Learun.Application.Web.Controllers { //授权验证 var lc = LicenseChecker.CheckLicense(); + //授权到期前发送邮件提醒 + if (!string.IsNullOrEmpty(lc.ExpirationDate) && !lc.ExpirationDate.Contains("永久有效")) + { + emailSendIBLL.Send(lc.ExpirationDate); + } if (!lc.Result) { return Content(""); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config index 78316343f..26ba167ed 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config @@ -49,13 +49,13 @@ - + - + - + - + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LR_Desktop/ShowAuthorizeMap.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LR_OA/ShowAuthorizeMap.cs similarity index 93% rename from Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LR_Desktop/ShowAuthorizeMap.cs rename to Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LR_OA/ShowAuthorizeMap.cs index 81521efe5..08101bf65 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LR_Desktop/ShowAuthorizeMap.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LR_OA/ShowAuthorizeMap.cs @@ -1,4 +1,4 @@ -using Learun.Application.TwoDevelopment.LR_Desktop; +using Learun.Application.OA; using System.Data.Entity.ModelConfiguration; namespace Learun.Application.Mapping diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj index 4dae57500..6c3629cb5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj @@ -570,7 +570,7 @@ - + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/Email/EmailSend/EmailSendBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/Email/EmailSend/EmailSendBLL.cs index a468dd91a..636582b73 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/Email/EmailSend/EmailSendBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/Email/EmailSend/EmailSendBLL.cs @@ -1,6 +1,7 @@ using Learun.Util; using System; using System.Collections.Generic; +using System.Linq; namespace Learun.Application.OA.Email.EmailSend { @@ -14,6 +15,7 @@ namespace Learun.Application.OA.Email.EmailSend public class EmailSendBLL : EmailSendIBLL { private EmailSendService emailSendService = new EmailSendService(); + private ShowAuthorizeService showAuthorizeService = new ShowAuthorizeService(); #region 获取数据 /// @@ -113,6 +115,55 @@ namespace Learun.Application.OA.Email.EmailSend } } } + + #endregion + + /// + /// 授权到期前发送邮件提醒 + /// + /// 授权到期时间 + public void Send(string ExpirationDate) + { + try + { + //授权到期发送邮件配置信息 + var showAuthorize = showAuthorizeService.GetShowAuthorizeEntity(); + if (showAuthorize != null && showAuthorize.IsRemind == 1) + { + //授权到期时间 + DateTime expirationDate = Convert.ToDateTime(ExpirationDate); + DateTime now = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd")); + //计算授权到期时间与当前时间相差的天数 + var ts = (expirationDate - now).Days; + //到期前{ExpirationTime}天，每天发送一封邮件 + if (ts >= 0 && ts <= showAuthorize.ExpirationTime) + { + //判断今天有没有发送过邮件，如果今天已经发送，不再重复发送 + if (emailSendService.GetTodayList(showAuthorize.EmailAddr).Count() <= 0) + { + //发送邮件 + if (MailHelper.Send(showAuthorize.EmailAddr, showAuthorize.EmailTitle, + showAuthorize.EmailContent)) + { + EmailSendEntity entity = new EmailSendEntity(); + entity.F_Sender = Config.GetValue("MailUserName"); + entity.F_To = showAuthorize.EmailAddr; + entity.F_Subject = showAuthorize.EmailTitle; + entity.F_BodyText = showAuthorize.EmailContent; + entity.F_Description = "授权到期提醒"; + emailSendService.SaveSendEntity("", entity); + } + } + } + + } + } + catch (Exception ex) + { + return; + } + } + } } \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/Email/EmailSend/EmailSendEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/Email/EmailSend/EmailSendEntity.cs index 4ee42074e..84997acee 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/Email/EmailSend/EmailSendEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/Email/EmailSend/EmailSendEntity.cs @@ -157,12 +157,13 @@ namespace Learun.Application.OA.Email.EmailSend /// public void Create() { + this.F_Id = Guid.NewGuid().ToString(); this.F_CreatorTime = DateTime.Now; this.F_Date = DateTime.Now; this.F_EnabledMark = 0; this.F_DeleteMark = 0; UserInfo userInfo = LoginUserInfo.Get(); - this.F_CreatorUserId = userInfo.userId; + this.F_CreatorUserId = userInfo?.userId; } /// /// 编辑调用 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/Email/EmailSend/EmailSendIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/Email/EmailSend/EmailSendIBLL.cs index a9465eeaf..6d017c9b1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/Email/EmailSend/EmailSendIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/Email/EmailSend/EmailSendIBLL.cs @@ -42,6 +42,7 @@ namespace Learun.Application.OA.Email.EmailSend /// 邮件发送实体 /// void SaveSendEntity(string keyValue, EmailSendEntity sendEntity); + void Send(string ExpirationDate); #endregion } } \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/Email/EmailSend/EmailSendService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/Email/EmailSend/EmailSendService.cs index 2843a056e..14f23999f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/Email/EmailSend/EmailSendService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/Email/EmailSend/EmailSendService.cs @@ -81,6 +81,30 @@ namespace Learun.Application.OA.Email.EmailSend } } } + + /// + /// 获取今天的邮件数据 + /// + /// + public IEnumerable GetTodayList(string emailAddr) + { + try + { + string sql = $@"SELECT * FROM LR_EmailSend t WHERE t.F_DeleteMark = 0 AND t.F_EnabledMark = 0 and DATEDIFF(DD,F_CreatorTime,Getdate())=0 and cast(F_To as nvarchar)='{emailAddr}' and F_Description='授权到期提醒'"; + return this.BaseRepository().FindList(sql); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } #endregion #region 提交数据 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/Learun.Application.OA.csproj b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/Learun.Application.OA.csproj index 164545276..3468091e5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/Learun.Application.OA.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/Learun.Application.OA.csproj @@ -152,6 +152,10 @@ + + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/ShowAuthorize/ShowAuthorizeBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/ShowAuthorize/ShowAuthorizeBLL.cs similarity index 98% rename from Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/ShowAuthorize/ShowAuthorizeBLL.cs rename to Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/ShowAuthorize/ShowAuthorizeBLL.cs index fb17ad1a1..30a4a4bc3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/ShowAuthorize/ShowAuthorizeBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/ShowAuthorize/ShowAuthorizeBLL.cs @@ -3,7 +3,7 @@ using System; using System.Data; using System.Collections.Generic; -namespace Learun.Application.TwoDevelopment.LR_Desktop +namespace Learun.Application.OA { /// /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/ShowAuthorize/ShowAuthorizeEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/ShowAuthorize/ShowAuthorizeEntity.cs similarity index 97% rename from Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/ShowAuthorize/ShowAuthorizeEntity.cs rename to Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/ShowAuthorize/ShowAuthorizeEntity.cs index 78529431d..6913f10fd 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/ShowAuthorize/ShowAuthorizeEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/ShowAuthorize/ShowAuthorizeEntity.cs @@ -2,7 +2,7 @@ using System; using System.ComponentModel.DataAnnotations.Schema; -namespace Learun.Application.TwoDevelopment.LR_Desktop +namespace Learun.Application.OA { /// /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/ShowAuthorize/ShowAuthorizeIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/ShowAuthorize/ShowAuthorizeIBLL.cs similarity index 96% rename from Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/ShowAuthorize/ShowAuthorizeIBLL.cs rename to Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/ShowAuthorize/ShowAuthorizeIBLL.cs index d82331ae3..1b34c577a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/ShowAuthorize/ShowAuthorizeIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/ShowAuthorize/ShowAuthorizeIBLL.cs @@ -2,7 +2,7 @@ using System.Data; using System.Collections.Generic; -namespace Learun.Application.TwoDevelopment.LR_Desktop +namespace Learun.Application.OA { /// /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/ShowAuthorize/ShowAuthorizeService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/ShowAuthorize/ShowAuthorizeService.cs similarity index 85% rename from Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/ShowAuthorize/ShowAuthorizeService.cs rename to Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/ShowAuthorize/ShowAuthorizeService.cs index 4e975b5ca..a4d93a7c6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/ShowAuthorize/ShowAuthorizeService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/ShowAuthorize/ShowAuthorizeService.cs @@ -7,7 +7,7 @@ using System.Data; using System.Linq; using System.Text; -namespace Learun.Application.TwoDevelopment.LR_Desktop +namespace Learun.Application.OA { /// /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 @@ -45,7 +45,7 @@ namespace Learun.Application.TwoDevelopment.LR_Desktop var queryParam = queryJson.ToJObject(); // 虚拟参数 var dp = new DynamicParameters(new { }); - return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination); + return this.BaseRepository().FindList(strSql.ToString(), dp, pagination); } catch (Exception ex) { @@ -69,7 +69,7 @@ namespace Learun.Application.TwoDevelopment.LR_Desktop { try { - return this.BaseRepository("CollegeMIS").FindList().FirstOrDefault(); + return this.BaseRepository().FindList().FirstOrDefault(); } catch (Exception ex) { @@ -96,7 +96,7 @@ namespace Learun.Application.TwoDevelopment.LR_Desktop { try { - this.BaseRepository("CollegeMIS").Delete(t => t.Id == keyValue); + this.BaseRepository().Delete(t => t.Id == keyValue); } catch (Exception ex) { @@ -120,16 +120,16 @@ namespace Learun.Application.TwoDevelopment.LR_Desktop { try { - var model = this.BaseRepository("CollegeMIS").FindList().FirstOrDefault(); + var model = this.BaseRepository().FindList().FirstOrDefault(); if (model != null) { entity.Modify(model.Id); - this.BaseRepository("CollegeMIS").Update(entity); + this.BaseRepository().Update(entity); } else { entity.Create(); - this.BaseRepository("CollegeMIS").Insert(entity); + this.BaseRepository().Insert(entity); } } catch (Exception ex) diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj index 19b097ac5..53f7d3521 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj @@ -1763,10 +1763,6 @@ - - - -