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

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -5544,7 +5544,7 @@ 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 <= DateTime.Now.AddDays(-30)) ?? new Users();
+            var user = db.Users.FirstOrDefault(m => m.Status == -1 && m.MakerCode == MakerCode && m.LogOutDate >= DateTime.Now.AddDays(-30)) ?? new Users();
             if (user.Id == 0)
             {
                 return "创客" + MakerCode + "不存在或不满足恢复条件";
@@ -5552,6 +5552,8 @@ namespace MySystem.Areas.Admin.Controllers
             else
             {
                 user.Status = 0;
+                user.LogOutDate = null;
+                user.Mobile = user.Mobile.TrimEnd('d');
                 db.UserForMobile.Add(new UserForMobile()
                 {
                     Mobile = user.Mobile,
@@ -5562,6 +5564,7 @@ namespace MySystem.Areas.Admin.Controllers
                     MakerCode = user.MakerCode,
                     UserId = user.Id,
                 });
+                AddSysLog(user.Id.ToString(), "注销30天内恢复创客信息", "修改" + SysUserName + "_" + SysRealName);
                 db.SaveChanges();
             }
             return "success";

Areas/Admin/Views/MainServer/SysTools/RestoreUserInfo.cshtml

@@ -41,7 +41,7 @@
                     </div>
                     <div class="layui-form-item ml10">
                         <div class="layui-input-block">
-                            <button type="button" class="layui-btn" onclick="save()">查询</button>
+                            <button type="button" class="layui-btn" onclick="save()">提交</button>
                         </div>
                     </div>
                 </div>
@@ -55,8 +55,8 @@
     <script src="/other/mybjq/lang/zh_CN.js"></script>
     <script>
         function save() {
-            var OrderNo = $('#MakerCode').val();
-            if (OrderNo == '') {
+            var MakerCode = $('#MakerCode').val();
+            if (MakerCode == '') {
                 layer.msg('请输入创客编码');
             }
             else {