Merge branch 'feature-dgy-辅助工具添加30天内注销恢复' into feature-dgy-后台测试

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -5550,33 +5550,36 @@ namespace MySystem.Areas.Admin.Controllers
         [HttpPost]
         public string RestoreUserInfoDo(string MakerCode)
         {
-            var user = db.Users.FirstOrDefault(m => m.Status == -1 && m.MakerCode == MakerCode && m.LogOutDate.Value.ToString("yyyyMM") == DateTime.Now.ToString("yyyyMM")) ?? new Users();
+            var user = db.Users.FirstOrDefault(m => m.Status == -1 && m.MakerCode == MakerCode) ?? new Users();
             if (user.Id == 0)
             {
-                return "创客" + MakerCode + "不存在或不满足恢复条件";
-            }
-            else if (user.LogOutDate.Value.ToString("yyyyMMdd") != DateTime.Now.ToString("yyyyMMdd"))
-            {
-                return "创客" + MakerCode + "注销时间和当前时间存在月份跨度，不满足恢复条件";
+                return "创客" + MakerCode + "不存在";
             }
             else
             {
-                user.Status = 0;
-                user.LogOutDate = null;
-                user.Mobile = user.Mobile.TrimEnd('d');
-                user.CertId = user.CertId.TrimEnd('d');
-                db.UserForMobile.Add(new UserForMobile()
+                if (user.LogOutDate.Value.ToString("yyyyMM") == DateTime.Now.ToString("yyyyMM"))
                 {
-                    Mobile = user.Mobile,
-                    UserId = user.Id,
-                });
-                db.UserForMakerCode.Add(new UserForMakerCode()
+                    user.Status = 0;
+                    user.LogOutDate = null;
+                    user.Mobile = user.Mobile.TrimEnd('d');
+                    user.CertId = user.CertId.TrimEnd('d');
+                    db.UserForMobile.Add(new UserForMobile()
+                    {
+                        Mobile = user.Mobile,
+                        UserId = user.Id,
+                    });
+                    db.UserForMakerCode.Add(new UserForMakerCode()
+                    {
+                        MakerCode = user.MakerCode,
+                        UserId = user.Id,
+                    });
+                    AddSysLog(user.Id.ToString(), "注销30天内恢复创客信息", "修改" + SysUserName + "_" + SysRealName);
+                    db.SaveChanges();
+                }
+                else
                 {
-                    MakerCode = user.MakerCode,
-                    UserId = user.Id,
-                });
-                AddSysLog(user.Id.ToString(), "注销30天内恢复创客信息", "修改" + SysUserName + "_" + SysRealName);
-                db.SaveChanges();
+                    return "创客" + MakerCode + "不满足恢复条件";
+                }
             }
             return "success";
         }