合并master

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdMajor/Form.cshtml

@@ -16,7 +16,7 @@
         <input id="LengthOfSchooling" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="CdMajor">
-        <div class="lr-form-item-title">学科门类</div>
+        <div class="lr-form-item-title">专业类别</div>
         <div id="SubjectSpeciesNo"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="CdMajor">
@@ -32,7 +32,7 @@
         <input id="MajorNameEn" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="CdMajor">
-        <div class="lr-form-item-title">教委专业代码</div>
+        <div class="lr-form-item-title">专业代码</div>
         <input id="GovMajorNo" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="CdMajor">

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",

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js

@@ -74,7 +74,7 @@ var bootstrap = function ($, learun) {
                             // 是否允许搜索
                             allowSearch: true,
                             // 访问数据接口地址
-                            url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTreeNoCheck',
+                            url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTree',
                             // 访问数据接口参数
                             param: { companyId: item.f_companyid, parentId: '0' }
                         });

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormEdit.js

@@ -27,7 +27,7 @@ var bootstrap = function ($, learun) {
                             // 是否允许搜索
                             allowSearch: true,
                             // 访问数据接口地址
-                            url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTreeNoCheck',
+                            url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTree',
                             // 访问数据接口参数
                             param: { companyId: item.f_companyid, parentId: '0' }
                         });

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.cshtml

@@ -47,12 +47,8 @@
                                     <div id="PartyFaceNo"></div>
                                 </div>
                                 <div class="col-xs-6 lr-form-item">
-                                    <div class="lr-form-item-title">最高学历</div>
-                                    <div id="HighestRecord"></div>
-                                </div>
-                                <div class="col-xs-6 lr-form-item">
-                                    <div class="lr-form-item-title">是否审核</div>
-                                    <div id="CheckMark"></div>
+                                    <div class="lr-form-item-title">文化程度</div>
+                                    <div id="CultureDegreeNo"></div>
                                 </div>
                             </div>
                         </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js

@@ -48,29 +48,20 @@ var bootstrap = function ($, learun) {
             $('#RegionNo').lrselect();
             //政治面貌
             $('#PartyFaceNo').lrDataSourceSelect({ code: 'BCdPartyFace', value: 'partyfaceno', text: 'partyface' });
-            //最高学历
-            $('#HighestRecord').lrDataSourceSelect({ code: 'BCdCultureDegree', value: 'culturedegreeno', text: 'culturedegree' });
+            //文化程度
+            $('#CultureDegreeNo').lrDataSourceSelect({ code: 'BCdCultureDegree', value: 'culturedegreeno', text: 'culturedegree' });
 
 
             //民族
             $('#NationalityNo').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' });
             //性别
             $('#GenderNo').lrDataItemSelect({ code: 'usersexbit' });
-            //是否审核
-            $('#CheckMark').lrDataItemSelect({ code: 'YesOrNoInt' });
             //学位
             $('#DegreeNo').lrDataSourceSelect({ code: 'BCdDegree', value: 'degreeno', text: 'degreename' });
             //职称
             $('#ProfessionalTitle').lrDataItemSelect({ code: 'jszc' });
             // 部门选择
-            $('#F_DepartmentId').lrselect({
-                type: 'tree',
-                // 是否允许搜索
-                allowSearch: true,
-                // 访问数据接口地址
-                url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTreeNoCheck',
-                // 访问数据接口参数
-            });
+            $('#F_DepartmentId').lrselect();
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
@@ -407,7 +398,7 @@ var bootstrap = function ($, learun) {
                     { label: "身份证号", name: "IdentityCardNo", width: 150, align: "left" },
 
                     {
-                        label: "最高学历", name: "HighestRecord", width: 100, align: "left",
+                        label: "文化程度", name: "CultureDegreeNo", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdCultureDegree',

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) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj

@@ -332,6 +332,7 @@
     <Compile Include="Areas\EducationalAdministration\Controllers\StuGrantController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\StuInfoBasicChangeController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\StuScoreNotPassController.cs" />
+    <Compile Include="Areas\EducationalAdministration\Controllers\Sys_DefaultPwdConfigController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\Sys_ReceiveDocumentController.cs" />
     <Compile Include="Areas\EvaluationTeach\EvaluationTeachAreaRegistration.cs" />
     <Compile Include="Areas\EvaluationTeach\Controllers\Eval_MainController.cs" />
@@ -476,7 +477,9 @@
     <Compile Include="Areas\Permission\PermissionAreaRegistration.cs" />
     <Compile Include="Areas\PersonnelManagement\Controllers\EpidemicReportController.cs" />
     <Compile Include="Areas\PersonnelManagement\Controllers\EpidemicSituationCopyController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\MeetingMinutesController.cs" />
     <Compile Include="Areas\PersonnelManagement\Controllers\MeetingNoticeController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\MeetingSignInRecordController.cs" />
     <Compile Include="Areas\PersonnelManagement\Controllers\MP_PerformanceTrackingController.cs" />
     <Compile Include="Areas\PersonnelManagement\Controllers\MP_QualityObjectivesController.cs" />
     <Compile Include="Areas\PersonnelManagement\Controllers\MP_ManagementPlanController.cs" />
@@ -802,8 +805,6 @@
     <Compile Include="Areas\EducationalAdministration\Controllers\Sys_InformationPushController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\StuLeaveManagementController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\EATalentTrainController.cs" />
-    <Compile Include="Areas\EducationalAdministration\Controllers\Sys_DefaultPwdConfigController.cs" />
-    <Compile Include="Areas\PersonnelManagement\Controllers\MeetingSignInRecordController.cs" />
     <Compile Include="Areas\PersonnelManagement\Controllers\MeetingMinutesController.cs" />
     <Compile Include="Areas\PersonnelManagement\Controllers\ResearchGERController.cs" />
     <Compile Include="Areas\PersonnelManagement\Controllers\ReleaseMettingController.cs" />
@@ -1381,14 +1382,6 @@
     <Content Include="Areas\PersonnelManagement\Views\ContractManagement\FormRemove.js" />
     <Content Include="Areas\PersonnelManagement\Views\ContractManagement\FormTerminate.js" />
     <Content Include="Areas\PersonnelManagement\Views\ContractManagement\FormRenew.js" />
-    <Content Include="Areas\PersonnelManagement\Views\FundExaminer\Form.js" />
-    <Content Include="Areas\PersonnelManagement\Views\FundExaminer\Index.js" />
-    <Content Include="Areas\PersonnelManagement\Views\MeetingManagement\FormView.js" />
-    <Content Include="Areas\PersonnelManagement\Views\MeetingManagement\IndexOfMyApply.js" />
-    <Content Include="Areas\PersonnelManagement\Views\MeetingNotice\Form.js" />
-    <Content Include="Areas\PersonnelManagement\Views\MeetingNotice\Index.js" />
-    <Content Include="Areas\PersonnelManagement\Views\ResearchMent\Form.js" />
-    <Content Include="Areas\PersonnelManagement\Views\ResearchMent\Index.js" />
     <Content Include="Areas\PersonnelManagement\Views\Sal_UserSalary\ImportForm.css" />
     <Content Include="Areas\PersonnelManagement\Views\Sal_UserSalary\ImportForm.js" />
     <Content Include="Areas\PersonnelManagement\Views\StuSaverecord\IndexForStudent.js" />

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);