From 3bd678b3c9db82263e600ba7d92072dda37a0084 Mon Sep 17 00:00:00 2001 From: ndbs Date: Wed, 5 Jun 2024 11:12:55 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=20=E5=85=A8=E9=99=A2=E5=AD=A6=E7=94=9F?= =?UTF-8?q?=E6=88=90=E7=BB=A9=E6=9F=A5=E7=9C=8B=20=E5=8F=AA=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=8F=96=E6=B6=88=E7=AC=AC=E4=BA=8C=E6=AC=A1=E8=A1=A5?= =?UTF-8?q?=E8=80=83=E6=88=90=E7=BB=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/StuScore/AllStuScoreQueryIndex.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.js index 485c6bcb7..a4d3195ae 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.js @@ -129,8 +129,8 @@ var bootstrap = function ($, learun) { { label: '科目', name: 'LessonName', width: 300, align: "left" }, { label: '学分', name: 'StudyScore', width: 50, align: "left" }, { label: '成绩', name: 'Score', width: 100, align: "left" }, - { label: '第一次补考成绩', name: 'ScoreOfNotPass', width: 100, align: "left" }, - { label: '第二次补考成绩', name: 'ScoreOfNotPassTwo', width: 100, align: "left" }, + { label: '补考成绩', name: 'ScoreOfNotPass', width: 100, align: "left" }, + //{ label: '第二次补考成绩', name: 'ScoreOfNotPassTwo', width: 100, align: "left" }, { label: '专业排名', name: 'RankInMajor', width: 100, align: "left" }, { label: '班级排名', name: 'RankInClass', width: 100, align: "left" }, ], From 98db350bc26435e5d5fb26e02ad31c3df5764084 Mon Sep 17 00:00:00 2001 From: ndbs Date: Mon, 3 Jun 2024 09:12:03 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=A0=A1=E5=8C=BA=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=B8=8A=E7=BA=A7=E4=B8=8D=E5=85=81=E8=AE=B8=E9=80=89=E8=87=AA?= =?UTF-8?q?=E5=B7=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Company/CompanyService.cs | 3 ++- .../Controllers/CompanyController.cs | 17 +++++++++++++++-- .../Views/Company/Form.cshtml | 2 +- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Organization/Company/CompanyService.cs b/Learun.Framework.Ultimate V7/Learun.Application.Organization/Company/CompanyService.cs index ac26c1139..0ca9a1926 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Organization/Company/CompanyService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Organization/Company/CompanyService.cs @@ -53,7 +53,8 @@ namespace Learun.Application.Organization t.F_Photo, t.F_BriefIntroduction, t.F_EnrollmentInformation, - t.F_ModifyUserName + t.F_ModifyUserName, + T.F_USCreditCode "; } #endregion diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Controllers/CompanyController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Controllers/CompanyController.cs index e7baf2ceb..331a99b66 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Controllers/CompanyController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Controllers/CompanyController.cs @@ -130,6 +130,11 @@ namespace Learun.Application.Web.Areas.LR_OrganizationModule.Controllers list = list.Where(m => m.F_CompanyId != keyValue).ToList(); } + if (keyValue == entity.F_ParentId) + { + return Fail("操作失败,当前项不允许"); + } + if (list.Any(a => a.F_FullName == entity.F_FullName)) { return Fail("学校名称重复"); @@ -156,8 +161,16 @@ namespace Learun.Application.Web.Areas.LR_OrganizationModule.Controllers [AjaxOnly] public ActionResult DeleteForm(string keyValue) { - companyIBLL.VirtualDelete(keyValue); - return Success("删除成功！", "公司信息", OperationType.Delete, keyValue, ""); + var list = companyIBLL.GetList().Where(x => x.F_ParentId == keyValue && x.F_EnabledMark == 1 && x.F_DeleteMark == 0); + if (list.Count() > 0) + { + return Fail("删除失败！拥有下辖项不可直接删除"); + } + else + { + companyIBLL.VirtualDelete(keyValue); + return Success("删除成功！", "公司信息", OperationType.Delete, keyValue, ""); + } } #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Company/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Company/Form.cshtml index 80801f5ea..d55398a13 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Company/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Company/Form.cshtml @@ -36,7 +36,7 @@
电子邮箱
-
+
照片
From 08684151b7254c7c86beb1147c315e1139c76263 Mon Sep 17 00:00:00 2001 From: ndbs Date: Mon, 3 Jun 2024 09:15:39 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E9=83=A8=E9=97=A8=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=B8=8A=E7=BA=A7=E4=B8=8D=E5=85=81=E8=AE=B8=E9=80=89=E8=87=AA?= =?UTF-8?q?=E5=B7=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/DepartmentController.cs | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Controllers/DepartmentController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Controllers/DepartmentController.cs index 869c9f0c6..993f3d6b8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Controllers/DepartmentController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Controllers/DepartmentController.cs @@ -17,6 +17,8 @@ namespace Learun.Application.Web.Areas.LR_OrganizationModule.Controllers private DepartmentIBLL departmentIBLL = new DepartmentBLL(); private CompanyIBLL companyIBLL = new CompanyBLL(); + private static DepartmentIBLL departmentIBLL_static = new DepartmentBLL(); + private static Dictionary mapData = departmentIBLL_static.GetModelMap(); #region 获取视图 /// /// 主页 @@ -150,6 +152,10 @@ namespace Learun.Application.Web.Areas.LR_OrganizationModule.Controllers return Fail("部门编号已存在！"); } } + if (keyValue == entity.F_ParentId) + { + return Fail("操作失败,当前项不允许"); + } //发送标识false entity.SendFlag = false; departmentIBLL.SaveEntity(keyValue, entity); @@ -164,8 +170,16 @@ namespace Learun.Application.Web.Areas.LR_OrganizationModule.Controllers [AjaxOnly] public ActionResult DeleteForm(string keyValue) { - departmentIBLL.VirtualDelete(keyValue); - return Success("删除成功！"); + var list = departmentIBLL.GetAllList().Where(x => x.F_ParentId == keyValue); + if (list.Count() > 0) + { + return Fail("删除失败！拥有下辖项不可直接删除"); + } + else + { + departmentIBLL.VirtualDelete(keyValue); + return Success("删除成功！"); + } } #endregion } From f3e3ad546c4d30cfd1b5234db899632e0c90e024 Mon Sep 17 00:00:00 2001 From: ndbs Date: Wed, 5 Jun 2024 16:01:11 +0800 Subject: [PATCH 4/4] 1 --- .../LR_OrganizationModule/Controllers/DepartmentController.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Controllers/DepartmentController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Controllers/DepartmentController.cs index 993f3d6b8..2c30b0f98 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Controllers/DepartmentController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Controllers/DepartmentController.cs @@ -1,5 +1,6 @@ using Learun.Application.Organization; using Learun.Util; +using System.Collections.Generic; using System.Linq; using System.Web.Mvc;