【修改】切换账号：增加名称、角色列；教师注册优化；

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/EmpInfoEnternalController.cs

@@ -19,6 +19,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         AnnexesFileIBLL annexesFileIBLL = new AnnexesFileBLL();
         public ActionResult FormAdd()
         {
+            ViewBag.EmpNo = CommonHelper.CreateNo();
             return View();
         }
 

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfoEnternal/FormAdd.cshtml

@@ -23,7 +23,7 @@
 
     <div class="header">
         <div class="fromSec">
-            <a href="#">数字化智慧校园</a> <span class="headerLine">|</span> <span>教职工信息注册</span>
+            <a href="/Home/Index">数字化智慧校园</a> <span class="headerLine">|</span> <span>教职工信息注册</span>
         </div>
     </div>
     <div class="warpper" id="app">
@@ -36,7 +36,7 @@
                     <div class="chickForm_sec1">
                         <div class="chickInput">
                                 <span class="chickInputLable"><span>*</span> 职工编号</span>
-                                <input type="text" id="EmpNo" name="EmpNo" lay-verify="required" placeholder="请输入职工编号" class="layui-input">
+                                <input value="@ViewBag.EmpNo" type="text" id="EmpNo" name="EmpNo" lay-verify="required" placeholder="请输入职工编号" class="layui-input">
                             </div>
 
                         <div class="chickInput">
@@ -262,7 +262,7 @@
                         var companys = $.parseJSON(msg).data.data;
                         var str = '<option value="">请选择</option>';
                         $.each(companys, function (i, item) {
-                            str += '<option value="' + item.f_departmentid + '">' + item.f_fullname + '</option>'
+                            str += '<option value="' + item.id + '">' + item.name + '</option>'
                         })
                         $("#F_DepartmentId").html(str);
                     },

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LoginUserBind/BindAccountIndex.js

@@ -39,6 +39,24 @@ var bootstrap = function ($, learun) {
                 url: top.$.rootUrl + '/EducationalAdministration/LoginUserBind/GetPageList',
                 headData: [
                     { label: "绑定账号", name: "BindUserAccount", width: 150, align: "left" },
+                    { label: "名称", name: "F_RealName", width: 150, align: "left" },
+                    {
+                        label: '角色', name: 'F_UserId', width: 250, align: 'left',
+                        formatterAsync: function (callback, value, row) {
+                            learun.httpAsyncGet(top.$.rootUrl + '/LR_OrganizationModule/User/GetRoleList?objectId=' + value, function (res) {
+                                if (res.code == learun.httpCode.success) {
+                                    var str = "";
+                                    for (var i = 0; i < res.data.roleInfoList.length; i++) {
+                                        str += res.data.roleInfoList[i].F_FullName;
+                                        if (i != res.data.roleInfoList.length - 1) {
+                                            str += ',';
+                                        }
+                                    }
+                                    callback(str);
+                                }
+                            });
+                        }
+                    },
                 ],
                 mainId: 'Id',
                 isPage: true,

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LoginUserBind/LoginUserBindEntity.cs

@@ -71,6 +71,10 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         #region  扩展字段
         [NotMapped]
         public string BindUserPasswordTemp { get; set; }
+        [NotMapped]
+        public string F_UserId { get; set; }
+        [NotMapped]
+        public string F_RealName { get; set; }
 
         #endregion
     }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LoginUserBind/LoginUserBindService.cs

@@ -30,8 +30,9 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             try
             {
                 var strSql = new StringBuilder();
-                strSql.Append("SELECT t.* ");
+                strSql.Append("SELECT t.*,u.F_UserId,u.F_RealName ");
                 strSql.Append("  FROM LoginUserBind t ");
+                strSql.Append(" left join LR_Base_User u on t.BindUserAccount=u.F_Account ");
                 strSql.Append("  WHERE 1=1 ");
                 var queryParam = queryJson.ToJObject();
                 // 虚拟参数