提交

代码/MadRunFabric.SignTokenApi/SignTokenApi/Controllers/UserAccountController.cs

@@ -605,7 +605,7 @@ namespace SignTokenApi.Controllers
             var cols = dtExcel.Columns;
             int colnum = cols.Count;
 
-            string dbkeys = _configuration["upload:dbkeys"].ToString();
+            string dbkeys = _configuration["upload:dbkeys"].ToString().ToLower();
             string[] dbcols = dbkeys.Split(",");
             string errmsg = string.Empty;
 
@@ -620,6 +620,33 @@ namespace SignTokenApi.Controllers
                     model.create_user = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value;
                     model.lock_flag = true;//导入禁用，需要重新编辑
                     model.dept_id = "import";
+                    List<string> plist = new List<string>();
+                    string arry = dr["postlist"].ToString();
+                    if (!string.IsNullOrEmpty(arry)) { 
+                    string[] arrystr = arry.Split(',');
+                    if (arrystr.Length > 0)
+                    {
+                        foreach (string s in arrystr)
+                        {
+                            plist.Add(s);
+                        }
+                        model.postlist = plist;
+                    }
+                    }
+                     arry = dr["projectlist"].ToString();
+                    if (!string.IsNullOrEmpty(arry))
+                    {
+                        string[] arrystr = arry.Split(',');
+                        if (arrystr.Length > 0)
+                        {
+                            foreach (string s in arrystr)
+                            {
+                                plist.Add(s);
+                            }
+                            model.projectlist = plist;
+                        }
+                    }
+
                     var dbcolslist = dbcols.ToList();
 
                     Type t = model.GetType();
@@ -629,7 +656,23 @@ namespace SignTokenApi.Controllers
                     {
                         if (dbcolslist.Contains(item.Name))
                         {
-                            object v = Convert.ChangeType(dr[dbcolslist.IndexOf(item.Name)].ToString(), item.PropertyType);
+                            object v = null;
+                            if (item.Name.ToLower() == "postlist"|| item.Name.ToLower() == "projectlist")
+                            {
+                                continue;
+                            }
+                            else
+                            {
+                                try
+                                {
+                                    v = Convert.ChangeType(dr[item.Name].ToString(), item.PropertyType);
+                                }
+                                catch
+                                {
+                                    continue;
+                                }
+                            }
+                           
                             item.SetValue(model, v, null);
                         }
                     }

代码/MadRunFabric.SignTokenApi/SignTokenApi/SignTokenApi.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.0</TargetFramework>

代码/MadRunFabric.SignTokenApi/SignTokenApi/appsettings.Development.json

@@ -28,7 +28,7 @@
     "InstanceName": "test"
   },
   "upload": {
-    "url": "http://yunwei.nuodajituan.com:28000/fileserverapi/api/upload",
+    "url": "http://192.168.0.1:28000/fileserverapi/api/upload",
     "params": "uploadtype=excel",
     "mbname": "工号.xlsx",
     "mbkeys": "id,usercode,username,sex,mobile,remark,team_id,postlist,projectlist",

代码/MadRunFabric.SignTokenApi/SignTokenApi/appsettings.Development_Base.json

@@ -30,6 +30,13 @@
     "Defaultdatabase": "5",
     "InstanceName": "base"
   },
+  "upload": {
+    "url": "http://192.168.0.1:28000/fileserverapi/api/upload",
+    "params": "uploadtype=excel",
+    "mbname": "工号.xlsx",
+    "mbkeys": "id,usercode,username,sex,mobile,remark,team_id,postlist,projectlist",
+    "dbkeys": "id,usercode,username,sex,mobile,remark,team_id,postlist,projectlist"
+  },
   "allprojectrole": "YWFJL|YWJL|YWZJ|CJGL|XTWH", //查看所有项目
   "spring": {
     "application": {

代码/MadRunFabric.SignTokenApi/SignTokenApi/appsettings.Development_Test.json

@@ -30,6 +30,13 @@
     "Defaultdatabase": "5",
     "InstanceName": "test"
   },
+  "upload": {
+    "url": "http://192.168.0.1:28000/fileserverapi/api/upload",
+    "params": "uploadtype=excel",
+    "mbname": "工号.xlsx",
+    "mbkeys": "id,usercode,username,sex,mobile,remark,team_id,postlist,projectlist",
+    "dbkeys": "id,usercode,username,sex,mobile,remark,team_id,postlist,projectlist"
+  },
   "allprojectrole": "YWFJL|YWJL|YWZJ|CJGL|XTWH", //查看所有项目
   "spring": {
     "application": {

代码/MadRunFabric.SignTokenApi/SignTokenApi/appsettings.Production.json

@@ -28,6 +28,13 @@
     "Defaultdatabase": "5",
     "InstanceName": "test"
   },
+  "upload": {
+    "url": "http://192.168.0.1:28000/fileserverapi/api/upload",
+    "params": "uploadtype=excel",
+    "mbname": "工号.xlsx",
+    "mbkeys": "id,usercode,username,sex,mobile,remark,team_id,postlist,projectlist",
+    "dbkeys": "id,usercode,username,sex,mobile,remark,team_id,postlist,projectlist"
+  },
   "allprojectrole": "YWFJL|YWJL|YWZJ|CJGL|XTWH", //查看所有项目
   "spring": {
     "application": {