【修改】导入配置页面增加“登录者账号”；

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Controllers/ExcelImportController.cs

@@ -184,7 +184,7 @@ namespace Learun.Application.Web.Areas.LR_SystemModule.Controllers
             DataTable dt = new DataTable();
             foreach (var col in fileds)
             {
-                if (col.F_RelationType != 1 && col.F_RelationType != 4 && col.F_RelationType != 5 && col.F_RelationType != 6 && col.F_RelationType != 7)
+                if (col.F_RelationType != 1 && col.F_RelationType != 4 && col.F_RelationType != 5 && col.F_RelationType != 6 && col.F_RelationType != 7 && col.F_RelationType != 8)
                 {
                     excelconfig.ColumnEntity.Add(new ColumnModel()
                     {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/ExcelImport/Form.js

@@ -44,6 +44,9 @@ var bootstrap = function ($, learun) {
             case 7://操作时间
                 row.F_Description = '导入时间';
                 break;
+            case 8://操作人账号
+                row.F_Description = '登录者账号';
+                break;
         }
 
     }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/ExcelImport/SetFieldForm.js

@@ -47,7 +47,7 @@ var bootstrap = function ($, learun) {
             });
 
             $('#F_RelationType').lrselect({
-                data: [{ "id": 0, "text": "无关联" }, { "id": 1, "text": "GUID" }, { "id": 2, "text": "数据字典" }, { "id": 3, "text": "数据来源" }, { "id": 4, "text": "固定数据" }, { "id": 5, "text": "登录者ID" }, { "id": 6, "text": "登录者名字" }, { "id": 7, "text": "导入时间" }],
+                data: [{ "id": 0, "text": "无关联" }, { "id": 1, "text": "GUID" }, { "id": 2, "text": "数据字典" }, { "id": 3, "text": "数据来源" }, { "id": 4, "text": "固定数据" }, { "id": 5, "text": "登录者ID" }, { "id": 6, "text": "登录者名字" }, { "id": 7, "text": "导入时间" }, { "id": 8, "text": "登录者账号" }],
                 placeholder: false,
                 maxHeight: 190,
                 select: function (item) {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Excel/Import/ExcelImportBLL.cs

@@ -388,6 +388,9 @@ namespace Learun.Application.Excel
                                         case 7://操作时间
                                             dp.Add(col.F_Name, DateTime.Now, dbType);
                                             break;
+                                        case 8://操作人账号
+                                            dp.Add(col.F_Name, userInfo.account, dbType);
+                                            break;
                                     }
                                 }
                                 if (!flag) continue;
@@ -576,6 +579,9 @@ namespace Learun.Application.Excel
                                         case 7://操作时间
                                             dp.Add(col.F_Name, DateTime.Now, dbType);
                                             break;
+                                        case 8://操作人账号
+                                            dp.Add(col.F_Name, userInfo.account, dbType);
+                                            break;
                                     }
                                 }
                                 if (!flag) continue;

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Excel/Import/ExcelImportFieldEntity.cs

@@ -44,7 +44,7 @@ namespace Learun.Application.Excel
         [Column("F_ONLYONE")]
         public int? F_OnlyOne { get; set; }
         /// <summary>
-        /// 关联类型0:无关联,1:GUID,2:数据字典3:数据表;4:固定数值;5:操作人ID;6:操作人名字;7:操作时间;
+        /// 关联类型0:无关联,1:GUID,2:数据字典3:数据表;4:固定数值;5:操作人ID;6:操作人名字;7:操作时间;8:操作人账号;
         /// </summary>
         /// <returns></returns>
         [Column("F_RELATIONTYPE")]