From 78432445761c6ee619936334321e8511bef711a4 Mon Sep 17 00:00:00 2001
From: fzp <645608524@qq.com>
Date: Mon, 18 Sep 2023 17:39:52 +0800
Subject: [PATCH] =?UTF-8?q?OperatorHelper=20=E5=A2=9E=E5=8A=A0grade?=
 =?UTF-8?q?=EF=BC=8Cmajor?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Learun.Util.Operat/Learun.Util.Operat.csproj    |  3 +++
 .../Learun.Util.Operat/OperatorHelper.cs            | 13 +++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Util/Learun.Util.Operat/Learun.Util.Operat.csproj b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Util/Learun.Util.Operat/Learun.Util.Operat.csproj
index f98c94941..0427b26e9 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Util/Learun.Util.Operat/Learun.Util.Operat.csproj	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Util/Learun.Util.Operat/Learun.Util.Operat.csproj	
@@ -39,6 +39,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Learun.Application.TwoDevelopment">
+      <HintPath>..\..\..\Learun.Application.Website\Bin\Learun.Application.TwoDevelopment.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Web" />
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Util/Learun.Util.Operat/OperatorHelper.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Util/Learun.Util.Operat/OperatorHelper.cs
index 0ed02d72b..dea817bbc 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Util/Learun.Util.Operat/OperatorHelper.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Util/Learun.Util.Operat/OperatorHelper.cs	
@@ -6,6 +6,7 @@ using Learun.Cache.Factory;
 using System;
 using System.Collections.Generic;
 using System.Web;
+using Learun.Application.TwoDevelopment.EducationalAdministration;
 
 namespace Learun.Util.Operat
 {
@@ -24,6 +25,8 @@ namespace Learun.Util.Operat
 
         private CompanyIBLL companyIBLL = new CompanyBLL();
         private DepartmentIBLL departmentIBLL = new DepartmentBLL();
+        private StuInfoBasicIBLL stuInfoBasicIBLL = new StuInfoBasicBLL();
+        CdMajorIBLL majorIbll = new CdMajorBLL();
 
 
         #endregion
@@ -335,6 +338,16 @@ namespace Learun.Util.Operat
                                 userInfo.postIds = userRelationIBLL.GetObjectIds(userEntity.F_UserId, 2);
                                 userInfo.companyIds = companyIBLL.GetSubNodes(userEntity.F_CompanyId);
                                 userInfo.departmentIds = departmentIBLL.GetSubNodes(userEntity.F_CompanyId, userEntity.F_DepartmentId);
+                                var studententity = stuInfoBasicIBLL.GetStuInfoBasicEntityByStuNo(userEntity.F_Account);
+                                if (studententity != null)
+                                {
+                                    userInfo.grade = studententity.Grade;
+                                    var majorinfo = majorIbll.GetCdMajorEntityByMajorNo(studententity.MajorNo);
+                                    if (majorinfo != null)
+                                    {
+                                        userInfo.majorno = majorinfo.ID ?? "";
+                                    }
+                                }
                                 userInfo.loadTime = DateTime.Now;
                                 if (HttpContext.Current != null)
                                 {