diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ScholarshipController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ScholarshipController.cs
index c5e9f444e..6a10a7f9c 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ScholarshipController.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ScholarshipController.cs	
@@ -127,7 +127,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         public ActionResult SaveForm(string keyValue, string strEntity)
         {
             ScholarshipEntity entity = strEntity.ToObject<ScholarshipEntity>();
-            var Lists = scholarshipIBLL.NameOrCode(entity.ItemName, entity.ItemCode, entity.IsValid);
+            var Lists = scholarshipIBLL.NameOrCode(entity.ItemName, entity.ItemCode, entity.IsType);
             if (string.IsNullOrEmpty(keyValue))
             {
                 if (Lists != null)
@@ -137,7 +137,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             }
             else
             {
-                if (!Lists.Id.Contains(keyValue))
+                if (Lists != null && !Lists.Id.Equals(keyValue))
                 {
                     return Fail("添加失败!名称或编码已存在");
                 }
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ScholarshipxjController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ScholarshipxjController.cs
index d2287d337..457ae3b3c 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ScholarshipxjController.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ScholarshipxjController.cs	
@@ -146,15 +146,16 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         {
             var LogUserinfo = LoginUserInfo.Get();
             ScholarshipxjEntity entity = strEntity.ToObject<ScholarshipxjEntity>();
+            if (string.IsNullOrEmpty(keyValue))
+            {
+                entity.State = "0";
+            }
             if (entity.State != "0")
             {
                 entity.AuditPeople = LogUserinfo.userId;
                 entity.AuditTime = DateTime.Today;
             }
             scholarshipxjIBLL.SaveEntity(keyValue, entity);
-            if (string.IsNullOrEmpty(keyValue))
-            {
-            }
             return Success("保存成功！");
         }
         #endregion
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Scholarship/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Scholarship/Index.js
index f4c8a0e0c..3d86afe27 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Scholarship/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Scholarship/Index.js	
@@ -42,6 +42,10 @@ var bootstrap = function ($, learun) {
             $('#lr_edit').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('Id');
                 if (learun.checkrow(keyValue)) {
+                    if (keyValue.indexOf(',') != -1) {
+                        learun.alert.warning("只能选择一条记录进行编辑！");
+                        return;
+                    }
                     learun.layerForm({
                         id: 'form',
                         title: '编辑',
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Scholarship/IndexZxj.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Scholarship/IndexZxj.js
index 6e1d9090a..09ab11e15 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Scholarship/IndexZxj.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Scholarship/IndexZxj.js	
@@ -42,6 +42,10 @@ var bootstrap = function ($, learun) {
             $('#lr_edit').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('Id');
                 if (learun.checkrow(keyValue)) {
+                    if (keyValue.indexOf(',') != -1) {
+                        learun.alert.warning("只能选择一条记录进行编辑！");
+                        return;
+                    }
                     learun.layerForm({
                         id: 'form',
                         title: '编辑',
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Scholarshipxj/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Scholarshipxj/Form.js
index c5c4dd2d9..064b42e43 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Scholarshipxj/Form.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Scholarshipxj/Form.js	
@@ -22,7 +22,7 @@ var bootstrap = function ($, learun) {
             $('#StuName').lrGirdSelect({
                 // 字段
                 url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=StuInfoBasic',
-                selectWord: 'stuno',
+                selectWord: 'stuname',
                 value: 'stuname',
                 text: 'stuname',
                 headData: [
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Scholarshipxj/FormAudit.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Scholarshipxj/FormAudit.js
index 71bf831d0..3916ce03b 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Scholarshipxj/FormAudit.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Scholarshipxj/FormAudit.js	
@@ -25,7 +25,7 @@ var bootstrap = function ($, learun) {
             $('#StuName').lrGirdSelect({
                 // 字段
                 url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=StuInfoBasic',
-                selectWord: 'stuno',
+                selectWord: 'stuname',
                 value: 'stuname',
                 text: 'stuname',
                 headData: [
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Scholarshipxj/Formzxj.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Scholarshipxj/Formzxj.js
index 700d3272f..4881f6b94 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Scholarshipxj/Formzxj.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Scholarshipxj/Formzxj.js	
@@ -28,7 +28,7 @@ var bootstrap = function ($, learun) {
             $('#StuName').lrGirdSelect({
                 // 字段
                 url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=StuInfoBasic',
-                selectWord: 'stuno',
+                selectWord: 'stuname',
                 value: 'stuname',
                 text: 'stuname',
                 headData: [
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/Scholarshipxj.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/Scholarshipxj.cs
new file mode 100644
index 000000000..7b930ce1a
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/Scholarshipxj.cs	
@@ -0,0 +1,29 @@
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using System.Data.Entity.ModelConfiguration;
+
+namespace  Learun.Application.Mapping
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-09-27 10:33
+    /// 描 述：学金类型
+    /// </summary>
+    public class Scholarshipxj : EntityTypeConfiguration<ScholarshipxjEntity>
+    {
+        public Scholarshipxj()
+        {
+            #region 表、主键
+            //表
+            this.ToTable("SCHOLARSHIPAUDIT");
+            //主键
+            this.HasKey(t => t.Id);
+            #endregion
+
+            #region 配置关系
+            #endregion
+        }
+    }
+}
+
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 267a563c6..9c834f59d 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	
@@ -88,6 +88,7 @@
     <Compile Include="EducationalAdministration\PracticeBaseMap.cs" />
     <Compile Include="EducationalAdministration\R_EnterBuildingMap.cs" />
     <Compile Include="EducationalAdministration\R_EnterSchoolMap.cs" />
+    <Compile Include="EducationalAdministration\Scholarshipxj.cs" />
     <Compile Include="EducationalAdministration\ScholarshipMap.cs" />
     <Compile Include="EducationalAdministration\ScoreStatisticsMap.cs" />
     <Compile Include="EducationalAdministration\StuCancelLeaveManagementMap.cs" />
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Scholarship/ScholarshipService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Scholarship/ScholarshipService.cs
index 7a990cbca..9f3661c51 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Scholarship/ScholarshipService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Scholarship/ScholarshipService.cs	
@@ -187,7 +187,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             try
             {
                 return this.BaseRepository("CollegeMIS").FindEntity<ScholarshipEntity>(x =>
-                    (x.ItemCode == ItemCode || x.ItemName == ItemName) && x.IsValid == IsType && x.IsDel == 0);
+                    (x.ItemCode == ItemCode || x.ItemName == ItemName) && x.IsType == IsType && x.IsDel == 0);
             }
             catch (Exception ex)
             {