From f48d40ba4ab78d913c7619919a4296439d5a7380 Mon Sep 17 00:00:00 2001
From: zhangli <1109134334@qq.com>
Date: Fri, 22 Jul 2022 11:01:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8A=A5=E5=90=8D=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E4=B8=93=E4=B8=9A=E5=AD=97=E6=AE=B5=EF=BC=8Cmajorname?=
 =?UTF-8?q?=E6=B2=A1=E4=BF=AE=E6=94=B9=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/StuEnroll/EnrollForm.js                 |  4 +++-
 .../Views/StuEnrollPhone/SearchResult.cshtml      | 15 ++++++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollForm.js
index 611af42e6..a68f072fd 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollForm.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollForm.js	
@@ -155,8 +155,10 @@ var bootstrap = function ($, learun) {
                 };
                 scoreList.push(entity);
             });
+        var entity = $('body').lrGetFormData();
+        entity.MajorName = $('#MajorNo').lrselectGetText();
         var postData = {
-            strEntity: JSON.stringify($('body').lrGetFormData()),
+            strEntity: JSON.stringify(entity),
             scoreList: JSON.stringify(scoreList)
         };
         $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuEnrollPhone/SaveForm?keyValue=' + keyValue, postData, function (res) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/SearchResult.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/SearchResult.cshtml
index 8420fe5f1..2eeb225b2 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/SearchResult.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/SearchResult.cshtml	
@@ -120,9 +120,22 @@
                             // $('#StuMobile').val(StuMobile);
                             var IsAdmission = data.StuEnroll.IsAdmission;
 
+                            var majorName = '';
+                            //专业
+                            $.ajax({
+                                url: "/EducationalAdministration/EmpInfoEnternal/GetMap?code=" + "CdMajorInfo" + '&where=' + "id='" + data.StuEnroll.MajorNo + "'",
+                                async: false,
+                                success: function (msg) {
+                                    var majorData = $.parseJSON(msg).data.data;
+                                    majorName = majorData[0].MajorName;
+                                },
+                            });
+                            if (!majorName) {
+                                majorName = data.StuEnroll.MajorName;
+                            }
                             if (IsAdmission == 1 || IsAdmission == true) {
                                 var major = data.StuEnroll.MajorName;
-                                $('#IsAdmission').val('恭喜您，已被我校录取' + data.StuEnroll.MajorName + '专业');
+                                $('#IsAdmission').val('恭喜您，已被我校录取' + majorName + '专业');
                                 //查询录取结果
                                 $('#admmsg').show();
                             } else if (IsAdmission === false) {