新生信息保存失败

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoFreshController.cs

@@ -440,17 +440,19 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             List<StuInfoFreshEmergePeopleEntity> stuInfoFreshEmergePeopleList = strstuInfoFreshEmergePeopleList.ToObject<List<StuInfoFreshEmergePeopleEntity>>();
             List<StuInfoFreshFamilyEntity> stuInfoFreshFamilyList = strstuInfoFreshFamilyList.ToObject<List<StuInfoFreshFamilyEntity>>();
             var kshList = stuInfoFreshIBLL.Getksh(entity.ksh);
-            if (!string.IsNullOrEmpty(keyValue))
+            if (string.IsNullOrEmpty(keyValue))
             {
-                kshList.Where(x => x.ID == keyValue);
-                if (kshList.Count() > 0)
+                if (kshList != null)
                 {
                     return Fail("保存失败,考生号不可重复");
                 }
             }
             else
             {
-                return Fail("保存失败,考生号不可重复");
+                if (kshList != null && kshList.ID != keyValue)
+                {
+                    return Fail("保存失败,考生号不可重复");
+                }
             }
             stuInfoFreshIBLL.SaveEntity(keyValue, entity, stuInfoFreshEmergePeopleList, stuInfoFreshFamilyList);
             return Success("保存成功！");

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Scholarshipxj/Indexzxj.js

@@ -68,6 +68,7 @@ var bootstrap = function ($, learun) {
             $('#lr_delete').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('Id');
                 if (learun.checkrow(keyValue)) {
+                    var State = $('#gridtable').jfGridValue('State');
                     if (State != 0) {
                         learun.alert.warning("当前项不可进行删除！");
                         return false;

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshBLL.cs

@@ -253,7 +253,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
             }
         }
-        public IEnumerable<StuInfoFreshEntity> Getksh(string ksh)
+        public StuInfoFreshEntity Getksh(string ksh)
         {
             try
             {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshIBLL.cs

@@ -75,7 +75,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <returns></returns>
         IEnumerable<StuInfoFreshEntity> GetStuInfoFreshListByClassNo(string classNo);
 
-        IEnumerable<StuInfoFreshEntity> Getksh(string ksh);
+        StuInfoFreshEntity Getksh(string ksh);
 
         /// <summary>
         /// 获取分配宿舍列表

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshService.cs

@@ -597,11 +597,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <param name="pagination">分页参数</param>
         /// <summary>
         /// <returns></returns>
-        public IEnumerable<StuInfoFreshEntity> Getksh(string ksh)
+        public StuInfoFreshEntity Getksh(string ksh)
         {
             try
             {
-                return this.BaseRepository("CollegeMIS").FindList<StuInfoFreshEntity>(x => x.ksh == ksh);
+                return this.BaseRepository("CollegeMIS").FindEntity<StuInfoFreshEntity>(x => x.ksh == ksh);
             }
             catch (Exception ex)
             {