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); } }