From 4d1234c1a0ac3ddee8c14b0fe98f724be4b2704b Mon Sep 17 00:00:00 2001
From: ndbs <nabs@LAPTOP-FJ5VQJ6J>
Date: Tue, 21 Feb 2023 15:17:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E7=B1=8D=E5=BC=82=E5=8A=A8-=E5=A5=96?=
 =?UTF-8?q?=E5=8A=A9=E5=AD=A6=E9=87=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/StuTransferInfo/QueryScholarshipIndex.js     |  3 +++
 .../ScholarshipTran/ScholarshipTranService.cs          | 10 +++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryScholarshipIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryScholarshipIndex.js
index cb50bc7e4..6d950b334 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryScholarshipIndex.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryScholarshipIndex.js	
@@ -1,5 +1,6 @@
 var refreshGirdData;
 var StuId;
+var StuNo = request('StuNo');
 var tempdatra = new Array();
 var list = [];
 var bootstrap = function ($, learun) {
@@ -110,10 +111,12 @@ var bootstrap = function ($, learun) {
         search: function (param) {
             param = param || {};
             param.IsType = 0;
+            param.StuNo = StuNo;
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         },
         search2: function (param) {
             param = param || {};
+            param.StuNo = StuNo;
             param.IsType = 1;
             $('#gridtableTwo').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ScholarshipTran/ScholarshipTranService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ScholarshipTran/ScholarshipTranService.cs
index f84ed4977..b5fb6a99b 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ScholarshipTran/ScholarshipTranService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ScholarshipTran/ScholarshipTranService.cs	
@@ -64,11 +64,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     dp.Add("IdentityCardNo", "%" + queryParam["IdentityCardNo"].ToString() + "%", DbType.String);
                     strSql.Append(" AND s.IdentityCardNo Like @IdentityCardNo ");
                 }
-                //var userlogin = LoginUserInfo.Get();
-                //if (userlogin.Description == "学生")
-                //{
-                //    strSql.Append(" AND t.stuno = '" + userlogin.account + "' ");
-                //}
+                if (!queryParam["StuNo"].IsEmpty())
+                {
+                    dp.Add("StuNo", queryParam["StuNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.StuNo = @StuNo ");
+                }
                 return this.BaseRepository("CollegeMIS").FindList<ScholarshipTranEntity>(strSql.ToString(), dp, pagination);
             }
             catch (Exception ex)