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

@@ -6,7 +6,7 @@
     <div class="col-xs-6 lr-form-item" data-table="OfficeEquipment">
         <div class="lr-form-item-title">使用管理人<font face="宋体">*</font></div>
         <div id="Name" isvalid="yes" checkexpession="NotNull"></div>
-        <input id="JZGNo"  hidden="hidden"/>
+        <input id="UserId"  hidden="hidden"/>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="OfficeEquipment">
         <div class="lr-form-item-title">部门<font face="宋体">*</font></div>

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

@@ -28,7 +28,7 @@ var bootstrap = function ($, learun) {
                 text: 'f_realname',
                 headData:
                     [
-                        { label: "编号", name: "f_encode", width: 100, align: "left" },
+                        { label: "编号", name: "f_userid", width: 100, align: "left", ishide: true},
                         { label: "姓名", name: "f_realname", width: 100, align: "left" },
                         {
                             label: "部门", name: "f_departmentid", width: 100, align: "left",
@@ -47,7 +47,7 @@ var bootstrap = function ($, learun) {
                 select: function (item) {
                     ////赋值
                     $("#Name").val(item.f_realname);
-                    $("#JZGNo").val(item.f_encode);
+                    $("#UserId").val(item.f_userid);
                     $("#Department").lrselectSet(item.f_departmentid);
                 }
             });
@@ -60,11 +60,6 @@ var bootstrap = function ($, learun) {
                             $('#' + id ).jfGridSet('refreshdata', data[id]);
                         }
                         else {
-                            //console.log(data[id])
-                            //if (id == 'OfficeEquipment' && data[id]) {
-                            //    data[id].Name = "任山";
-                            //}
-                            //$('[data-table="' + id + '"]').lrSetFormData(data[id]);
                             $('[data-table="' + id + '"]').lrSetFormData(data[id]);
                         }
                     }

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

@@ -100,12 +100,12 @@ var bootstrap = function ($, learun) {
                 url: top.$.rootUrl + '/EducationalAdministration/OfficeEquipment/GetPageList',
                 headData: [
                     {
-                        label: "使用管理人", name: "JZGNo", width: 100, align: "left",
+                        label: "使用管理人", name: "UserId", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'TeacherInfo',
                                 key: value,
-                                keyId: 'f_encode',
+                                keyId: 'f_userid',
                                 callback: function (_data) {
                                     callback(_data['f_realname']);
                                 }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OfficeEquipment/IndexMy.js

@@ -100,12 +100,12 @@ var bootstrap = function ($, learun) {
                 url: top.$.rootUrl + '/EducationalAdministration/OfficeEquipment/GetPageList',
                 headData: [
                     {
-                        label: "使用管理人", name: "JZGNo", width: 100, align: "left",
+                        label: "使用管理人", name: "UserId", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'TeacherInfo',
                                 key: value,
-                                keyId: 'f_encode',
+                                keyId: 'f_userid',
                                 callback: function (_data) {
                                     callback(_data['f_realname']);
                                 }

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Arrangelesson.cs

@@ -530,10 +530,9 @@ namespace Learun.Application.WebApi.Modules
             if (Types == 0)
             {
                 var Data = officeEquipmentIBLL.GetOfficeEquipmentEntity(keyValue);
-                var emp = empinfoIBLL.GetEmpInfoEntityByEmpNo(Data.Name);
                 var Unit = dataItemIBLL.GetDetailList("sldw").Where(x => x.F_ItemValue == Data.Unit).FirstOrDefault();
                 result = "资产名称:" + Data.DeviceName + ";<br>资产编号:" + Data.Code + ";<br>品牌:" +
-                Data.Brand + ";<br>型号:" + Data.Model + ";<br>参数:" + Data.Argument + ";<br>单位:(" + Unit.F_ItemName + ");<br>数量:" + Data.Nuantity + ";<br>使用管理人:" + emp.EmpName + ";<br>备注:" + Data.Remark;
+                Data.Brand + ";<br>型号:" + Data.Model + ";<br>参数:" + Data.Argument + ";<br>单位:(" + Unit.F_ItemName + ");<br>数量:" + Data.Nuantity + ";<br>使用管理人:" + Data.Name + ";<br>备注:" + Data.Remark;
             }
             else
             {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OfficeEquipment/OfficeEquipmentEntity.cs

@@ -37,8 +37,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <summary>
         /// 姓名
         /// </summary>
-        [Column("JZGNO")]
-        public string JZGNo { get; set; }
+        [Column("USERID")]
+        public string UserId { get; set; }
         /// <summary>
         /// 所属部门
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OfficeEquipment/OfficeEquipmentService.cs

@@ -85,7 +85,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 {
                     if (!LoginUserInfo.Get().roleIds.Contains("5a6e22b1-2a08-4258-9964-3cb7fbb9ebee"))
                     {
-                        strSql.Append(" AND t.Name = '" + LoginUserInfo.Get().account + "' ");
+                        strSql.Append(" AND t.Name = '" + LoginUserInfo.Get().realName + "' ");
                     }
                 }
                 return this.BaseRepository("CollegeMIS").FindList<OfficeEquipmentEntity>(strSql.ToString(), dp, pagination);