完成待测试

Areas/Admin/Controllers/BsServer/ColController.cs

@@ -98,14 +98,7 @@ namespace MySystem.Areas.Admin.Controllers
                 item.Add("pid", int.Parse(dic["ParentId"].ToString()));
                 item.Add("title", dic["ColName"].ToString());
                 item.Add("url", UrlString);
-                if (ColId.Length > 6)
-                {
-                    item.Add("ColId", ColId);
-                }
-                else
-                {
-                    item.Add("ColId", "");
-                }
+                item.Add("ColId", ColId);
                 item.Add("Status", dic["Status"].ToString() == "1" ? "正常" : "关闭");
                 result.Add(item);
             }

Areas/Admin/Controllers/MainServer/SchoolMakerStudyController.cs

@@ -61,7 +61,7 @@ namespace MySystem.Areas.Admin.Controllers
 
 
             string condition = " and Status>-1";
-            if(!string.IsNullOrEmpty(data.SeoKeyword))
+            if (!string.IsNullOrEmpty(data.SeoKeyword))
             {
                 condition += " and SeoKeyword like '" + data.SeoKeyword + "%'";
             }
@@ -293,15 +293,49 @@ namespace MySystem.Areas.Admin.Controllers
             for (int i = 1; i < list.Count; i++)
             {
                 JsonData dr = list[i];
-
-                db.SchoolMakerStudy.Add(new SchoolMakerStudy()
+                string MakerCode = dr[0].ToString(); // 创客编号
+                string Auths = dr[1].ToString(); // 权限
+                string[] Auth = Auths.Split(',');
+                var userForMakerCode = db.UserForMakerCode.FirstOrDefault(m => m.MakerCode == MakerCode) ?? new UserForMakerCode();
+                var userInfo = db.Users.FirstOrDefault(m => m.Id == userForMakerCode.UserId) ?? new Users();
+                var check = db.UserCardRecord.Any(m => m.Id == userInfo.Id);
+                if (check)
                 {
-                    CreateDate = DateTime.Now,
-                    UpdateDate = DateTime.Now,
-
-                });
-                db.SaveChanges();
+                    var auth = db.UserCardRecord.FirstOrDefault(m => m.Id == userInfo.Id) ?? new UserCardRecord();
+                    auth.SeoDescription = auth.SeoDescription.TrimEnd(',');
+                    var time = 0;
+                    foreach (var item in Auth)
+                    {
+                        time += 1;
+                        if (!auth.SeoDescription.Contains(item))
+                        {
+                            if (time == 1)
+                            {
+                                auth.SeoDescription += "," + item + ",";
+                            }
+                            else
+                            {
+                                auth.SeoDescription += item + ",";
+                            }
+                        }
+                    }
+                    auth.UpdateDate = DateTime.Now;
+                    auth.UpdateMan = SysUserName + "-" + SysRealName;
+                    db.SaveChanges();
+                }
+                else
+                {
+                    var query = db.UserCardRecord.Add(new UserCardRecord()
+                    {
+                        Id = userInfo.Id,
+                        CreateDate = DateTime.Now, //创建时间
+                        CreateMan = SysUserName + "-" + SysRealName,
+                        SeoDescription = Auths,
+                    }).Entity;
+                    db.SaveChanges();
+                }
             }
+            db.SaveChanges();
             AddSysLog("0", "SchoolMakerStudy", "Import");
             return "success";
         }

wwwroot/layuiadmin/modules_main/SchoolMakerStudy_Admin.js

@@ -64,7 +64,7 @@ layui.config({
     $('#ExcelFile').change(function (e) {
         var files = e.target.files;
         excel.importExcel(files, {}, function (data) {
-            ExcelData = data[0].sheet1;
+            ExcelData = data[0].Sheet1;
         });
     });
 
@@ -324,7 +324,7 @@ layui.config({
                 cancel: function () {
                 }
             });
-            $("#excelTemp").html('<a href="/excelfile/模板文件.xlsx">点击下载模板文件</a>');
+            $("#excelTemp").html('<a href="/users/商学院创客权限模板.xlsx">点击下载商学院创客权限模板</a>');
         }
         , ExportExcel: function () {
             var userdata = '';