Merge branch 'develop' of http://47.109.31.237:13000/kxs-end/admin-server into DuGuYang

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -63,12 +63,12 @@ namespace MySystem.Areas.Admin.Controllers
                 Users user = db.Users.FirstOrDefault(m => m.MakerCode == MakerCode);
                 if (user != null)
                 {
+                    user.ParentUserId = puser.Id;
+                    user.ParentNav = puser.ParentNav + "," + puser.Id + ",";
                     if (IsTeam == 1)
                     {
-                        RelationForUserSub(user.Id, user);
+                        RelationForUserSub(db, user.Id, user);
                     }
-                    user.ParentUserId = puser.Id;
-                    user.ParentNav = puser.ParentNav + "," + puser.Id + ",";
                     db.SaveChanges();
                     function.WriteLog(DateTime.Now.ToString() + ":下级：" + MakerCode + ", 上级：" + ParentMakerCode, "换线日志");
                     return "success";
@@ -77,18 +77,17 @@ namespace MySystem.Areas.Admin.Controllers
             }
             return "上级创客编号不存在";
         }
-        private void RelationForUserSub(int ParentUserId, Users puser)
+        private void RelationForUserSub(WebCMSEntities dbnew, int ParentUserId, Users puser)
         {
-            var subusers = db.Users.Select(m => new { m.Id, m.ParentUserId, m.ParentNav }).Where(m => m.ParentUserId == ParentUserId).ToList();
+            var subusers = dbnew.Users.Select(m => new { m.Id, m.ParentUserId, m.ParentNav }).Where(m => m.ParentUserId == ParentUserId).ToList();
             foreach (var subuser in subusers)
             {
-                Users user = db.Users.FirstOrDefault(m => m.Id == subuser.Id);
+                Users user = dbnew.Users.FirstOrDefault(m => m.Id == subuser.Id);
                 if (user != null)
                 {
                     user.ParentUserId = puser.Id;
                     user.ParentNav = puser.ParentNav + "," + puser.Id + ",";
-                    db.SaveChanges();
-                    RelationForUserSub(user.Id, user);
+                    RelationForUserSub(dbnew, user.Id, user);
                 }
             }
         }