From c781717d4b957c0df4ef706450680c6f17f12344 Mon Sep 17 00:00:00 2001
From: ndbs <nabs@LAPTOP-FJ5VQJ6J>
Date: Wed, 19 Jan 2022 10:46:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=90=8D=E5=BD=95=E5=8F=96=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E6=9D=A1=E4=BB=B6=20=E6=B7=BB=E5=8A=A0=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/StuVolunteer/IndexAccount.js            |  1 +
 .../StuVolunteer/StuVolunteerEntity.cs            | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/IndexAccount.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/IndexAccount.js
index 77fab9c77..3bd7c35d6 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/IndexAccount.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/IndexAccount.js	
@@ -114,6 +114,7 @@ var bootstrap = function ($, learun) {
         },
         search: function (param) {
             param = param || {};
+            param.SqlParameter = " and IsEnroll=1 "
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuVolunteer/StuVolunteerEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuVolunteer/StuVolunteerEntity.cs
index 2b7b6ba64..d6aef3475 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuVolunteer/StuVolunteerEntity.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuVolunteer/StuVolunteerEntity.cs	
@@ -64,11 +64,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// </summary>
         [Column("CARDNO")]
         public string CardNo { get; set; }
-        ///// <summary>
-        ///// 系所号
-        ///// </summary>
-        //[Column("DEPTNO")]
-        //public string DeptNo { get; set; }
+        /// <summary>
+        /// 系所号
+        /// </summary>
+        [Column("DEPTNO")]
+        public string DeptNo { get; set; }
         /// <summary>
         /// 专业
         /// </summary>
@@ -233,18 +233,23 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <summary>
         /// 是否服从安排
         /// </summary>
+        [Column("ISPLAN")]
         public bool? IsPlan { get; set; }
         /// <summary>
         /// 准考证号
         /// </summary>
+        [Column("EXAMNO")]
         public string ExamNo { get; set; }
         /// <summary>
         /// 联系人
         /// </summary>
+        [Column("LINKMAN")]
         public string LinkMan { get; set; }
         /// <summary>
         /// 联系电话
         /// </summary>
+        [Column("LINKPHONE")]
+
         public string LinkPhone { get; set; }
 
         #endregion