Просмотр исходного кода

同步创客基本信息调整

lcl 1 месяц назад
Родитель
Сommit
ccefe70b2c
2 измененных файлов с 50 добавлено и 30 удалено
  1. BIN
      .DS_Store
  2. 50 30
      AppStart/Helper/SycnJavaUsersService.cs

+ 50 - 30
AppStart/Helper/SycnJavaUsersService.cs

@@ -63,46 +63,66 @@ namespace MySystem
                 string RealName = user.Username;
                 string HeadPhoto = user.Avatar;
 
-                Users edit = db.Users.FirstOrDefault(m => m.Mobile == Mobile);
-                if(edit != null)
+                Users add = db.Users.FirstOrDefault(m => m.Id == id);
+                if(add == null)
                 {
-                    db.Users.Remove(edit);
+                    Users edit = db.Users.FirstOrDefault(m => m.Mobile == Mobile);
+                    if(edit != null)
+                    {
+                        db.Users.Remove(edit);
+                    }
+                    db.SaveChanges();
+                    add = db.Users.Add(new Users()
+                    {
+                        Id = id,
+                        ParentUserId = pid,
+                        ParentNav = pidPath,
+                        CreateDate = CreateDate,
+                        MakerCode = MakerCode,
+                        Mobile = Mobile,
+                        RealName = RealName,
+                        HeadPhoto = HeadPhoto,
+                    }).Entity;
                 }
-                UserForMobile forMobile = db.UserForMobile.FirstOrDefault(m => m.Mobile == Mobile);
-                if(forMobile != null)
+                else
                 {
-                    db.UserForMobile.Remove(forMobile);
+                    add.ParentUserId = pid;
+                    add.ParentNav = pidPath;
+                    add.CreateDate = CreateDate;
+                    add.MakerCode = MakerCode;
+                    add.Mobile = Mobile;
+                    add.RealName = RealName;
+                    add.HeadPhoto = HeadPhoto;
                 }
-                UserForMakerCode forMakerCode = db.UserForMakerCode.FirstOrDefault(m => m.MakerCode == MakerCode);
-                if(forMakerCode != null)
+                db.SaveChanges();
+
+                UserForMobile userformobile = db.UserForMobile.FirstOrDefault(m => m.Mobile == Mobile);
+                if(userformobile == null)
                 {
-                    db.UserForMakerCode.Remove(forMakerCode);
+                    db.UserForMobile.Add(new UserForMobile()
+                    {
+                        Mobile = Mobile,
+                        UserId = add.Id
+                    });
                 }
-                db.SaveChanges();
-                Users add = db.Users.Add(new Users()
+                else
                 {
-                    Id = id,
-                    ParentUserId = pid,
-                    ParentNav = pidPath,
-                    CreateDate = CreateDate,
-                    MakerCode = MakerCode,
-                    Mobile = Mobile,
-                    RealName = RealName,
-                    HeadPhoto = HeadPhoto,
-                }).Entity;
-                db.SaveChanges();
+                    userformobile.UserId = add.Id;
+                }
 
-                db.UserForMobile.Add(new UserForMobile()
+                UserForMakerCode userformakercode = db.UserForMakerCode.FirstOrDefault(m => m.MakerCode == MakerCode);
+                if(userformakercode == null)
                 {
-                    Mobile = Mobile,
-                    UserId = add.Id
-                });
-
-                db.UserForMakerCode.Add(new UserForMakerCode()
+                    db.UserForMakerCode.Add(new UserForMakerCode()
+                    {
+                        MakerCode = MakerCode,
+                        UserId = add.Id
+                    });
+                }
+                else
                 {
-                    MakerCode = MakerCode,
-                    UserId = add.Id
-                });
+                    userformakercode.UserId = add.Id;
+                }
                 db.SaveChanges();
             }
             javaUser.Dispose();