From 5a589c4de693b318a889f0251a4aee698f4291de Mon Sep 17 00:00:00 2001 From: ndbs Date: Tue, 24 May 2022 09:24:03 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=8E=E6=96=B0=E5=8A=9F=E8=83=BD--=E6=84=8F?= =?UTF-8?q?=E5=90=91=E6=A0=87=E6=B3=A8----=E5=A1=AB=E6=8A=A5=E6=9C=AC?= =?UTF-8?q?=E6=A0=A1=E5=88=A4=E6=96=AD=E5=87=BA=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/StuVolunteer/IndexLabel.js | 9 +++++---- .../StuVolunteer/StuVolunteerService.cs | 2 ++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/IndexLabel.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/IndexLabel.js index a5323b870..40191e252 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/IndexLabel.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/IndexLabel.js @@ -82,7 +82,11 @@ var bootstrap = function ($, learun) { return; } var IsOurSchool = $('#gridtable').jfGridValue('IsOurSchool'); - if (IsOurSchool == false) { + + if (IsOurSchool == 'true') { + learun.alert.warning("当前项无需填报!"); + return; + } else { learun.layerForm({ id: 'form', title: '填报学校', @@ -93,9 +97,6 @@ var bootstrap = function ($, learun) { return top[id].acceptClick(refreshGirdData); } }); - } else { - learun.alert.warning("当前项无需填报!"); - return; } } }); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuVolunteer/StuVolunteerService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuVolunteer/StuVolunteerService.cs index 7b0bec81b..3a6ae8043 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuVolunteer/StuVolunteerService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuVolunteer/StuVolunteerService.cs @@ -250,6 +250,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration else { entity.Create(); + entity.IsOurSchool = false; + entity.IsIntention = false; this.BaseRepository("CollegeMIS").Insert(entity); } }