From 0983080ba6c080de7bc8f668ce91343785597c3d Mon Sep 17 00:00:00 2001
From: dyy <18335927079@163.com>
Date: Fri, 7 May 2021 16:02:31 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=93=E4=B8=9A=E4=BF=A1=E6=81=AF=E7=AE=A1?=
=?UTF-8?q?=E7=90=86=E5=88=97=E5=90=8D=EF=BC=9B=E4=BF=AE=E6=94=B9=E7=99=BB?=
=?UTF-8?q?=E5=BD=95=E7=94=A8=E6=88=B7=E8=A7=92=E8=89=B2=E7=9A=84=E8=8E=B7?=
=?UTF-8?q?=E5=8F=96=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Views/CdMajor/Form.cshtml | 4 ++--
.../EducationalAdministration/Views/CdMajor/Index.js | 4 ++--
.../Learun.Util/Learun.Util.Operat/OperatorHelper.cs | 12 ++++++++----
3 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdMajor/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdMajor/Form.cshtml
index 2a530e444..123bdb0d4 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdMajor/Form.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdMajor/Form.cshtml
@@ -16,7 +16,7 @@
@@ -32,7 +32,7 @@
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdMajor/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdMajor/Index.js
index 3485e9afa..ec57a6460 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdMajor/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdMajor/Index.js
@@ -135,7 +135,7 @@ var bootstrap = function ($, learun) {
{ label: "专业编号", name: "MajorNo", width: 100, align: "left" },
{ label: "学制", name: "LengthOfSchooling", width: 100, align: "left" },
{
- label: "学科门类", name: "SubjectSpeciesNo", width: 150, align: "left",
+ label: "专业类别", name: "SubjectSpeciesNo", width: 150, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('dataItem', {
key: value,
@@ -161,7 +161,7 @@ var bootstrap = function ($, learun) {
},
{ label: "名称缩写", name: "MajorNameBrief", width: 100, align: "left" },
{ label: "英文名称", name: "MajorNameEn", width: 100, align: "left" },
- { label: "教委专业代码", name: "GovMajorNo", width: 100, align: "left" },
+ { label: "专业代码", name: "GovMajorNo", width: 100, align: "left" },
{ label: "教委专业名称", name: "GovMajorName", width: 200, align: "left" },
{
label: "本专科", name: "GraduateNo", width: 100, align: "left",
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 f2fdaa45a..ae3a12744 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
@@ -5,6 +5,7 @@ using Learun.Cache.Base;
using Learun.Cache.Factory;
using System;
using System.Collections.Generic;
+using System.Linq;
using System.Web;
namespace Learun.Util.Operat
@@ -327,10 +328,13 @@ namespace Learun.Util.Operat
if (!string.IsNullOrEmpty(userInfo.roleIds))
{
var rolelist = userRelationIBLL.GetRoleListByUserId(userEntity.F_UserId);
- foreach (var roleEntity in rolelist)
- {
- userInfo.roleName += roleEntity.F_FullName+ ",";
- }
+ //未删且有效的角色编号
+ userInfo.roleIds = string.Join(",", rolelist.Select(x => x.F_RoleId).ToArray());
+ userInfo.roleName = string.Join(",", rolelist.Select(x => x.F_FullName).ToArray());
+ //foreach (var roleEntity in rolelist)
+ //{
+ // userInfo.roleName += roleEntity.F_FullName + ",";
+ //}
}
userInfo.postIds = userRelationIBLL.GetObjectIds(userEntity.F_UserId, 2);
userInfo.companyIds = companyIBLL.GetSubNodes(userEntity.F_CompanyId);
From 93b53ebb83d245feb3f28ec54f718a3ae256e25e Mon Sep 17 00:00:00 2001
From: dyy <18335927079@163.com>
Date: Fri, 7 May 2021 16:46:31 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?=
=?UTF-8?q?=E5=AD=A6=E7=B1=8D=E4=BF=A1=E6=81=AF=E7=AE=A1=E7=90=86=EF=BC=9A?=
=?UTF-8?q?=E5=88=97=E5=A2=9E=E5=8A=A0=E5=AD=A6=E7=94=9F=E7=B1=BB=E5=88=AB?=
=?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Views/StuInfoBasic/Index.js | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js
index 96a560242..ef5ff637a 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js
@@ -326,6 +326,17 @@ var bootstrap = function ($, learun) {
{ label: "联系电话", name: "mobile", width: 100, align: "left" },
{ label: "户口所在地", name: "FatherUnit", width: 100, align: "left" },
{ label: "档案所在地", name: "MatherUnit", width: 100, align: "left" },
+ {
+ label: "学生类别", name: "TestStuSortNo", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('dataItem', {
+ key: value,
+ code: 'TestStuSortNo',
+ callback: function (_data) {
+ callback(_data.text);
+ }
+ });
+ }
+ },
{
label: "异动状态", name: "AbmormityMoveMark", width: 80, align: "center",
formatter: function (cellvalue) {