diff --git a/24Hour/Controllers/Common/RemoteController.cs b/24Hour/Controllers/Common/RemoteController.cs
index 0c1976e..b433e5c 100644
--- a/24Hour/Controllers/Common/RemoteController.cs
+++ b/24Hour/Controllers/Common/RemoteController.cs
@@ -2,6 +2,7 @@
 using Elight.Logic;
 using Elight.Utility;
 using Elight.Utility.Code;
+using Elight.Utility.logs;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using SqlSugar;
@@ -112,6 +113,7 @@ namespace _24Hour.Controllers.Common
                 _db.RollbackTran();
                 result.IsSucceed = false;
                 result.Message = ex.Message;
+                LogService.WriteLog(ex, "远程会见添加");
             }
             _logs.WriteSysLogadd("远程会见管理", "添加远程会见", result, _db);
             return result;
@@ -142,6 +144,7 @@ namespace _24Hour.Controllers.Common
                 _db.RollbackTran();
                 result.IsSucceed = false;
                 result.Message = ex.Message;
+                LogService.WriteLog(ex, "远程会见修改");
             }
             _logs.WriteSysLogadd("远程会见管理", "修改远程会见", result, _db);
             return result;
@@ -177,65 +180,36 @@ namespace _24Hour.Controllers.Common
                 _db.RollbackTran();
                 result.IsSucceed = false;
                 result.Message = ex.Message;
+                LogService.WriteLog(ex, "远程会见删除");
             }
             _logs.WriteSysLogadd("远程会见管理", "删除远程会见", result, _db);
             return result;
         }
-
-
-        /// <summary>
-        /// 结束远程会见
-        /// </summary>
-        /// <param name="info"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("UpdateRemote_state")]
-        public async Task<Result> UpdateRemote_state(CurrencyDelete Currency)
-        {
-            try
-            {
-                var Receptionlist = await _db.Queryable<App_RemoteModel>().Where(q => Currency.id.Contains(q.Id)).ToListAsync();
-                Receptionlist.ForEach(q => { q.state = 1; });
-                _db.BeginTran();
-                var num = await _db.Updateable(Receptionlist).ExecuteCommandAsync();
-                _db.CommitTran();
-                if (num > 0)
-                {
-                    result.IsSucceed = true;
-                    result.result = "结束成功";
-                }
-            }
-            catch (System.Exception ex)
-            {
-                _db.RollbackTran();
-                result.IsSucceed = false;
-                result.Message = ex.Message;
-            }
-            _logs.WriteSysLogadd("远程会见管理", "结束远程会见", result, _db);
-            return result;
-        }
-
-
         /// <summary>
-        /// 取消远程会见
+        /// 远程会见状态更改
         /// </summary>
         /// <param name="info"></param>
         /// <returns></returns>
         [HttpPost]
-        [Route("Updatecancellation_state")]
-        public async Task<Result> Updatecancellation_state(CurrencyDelete Currency)
+        [Route("Updateagree_state")]
+        public async Task<Result> Updateagree_state(App_RemoteState data)
         {
             try
             {
-                var Receptionlist = await _db.Queryable<App_RemoteModel>().Where(q => Currency.id.Contains(q.Id)).ToListAsync();
-                Receptionlist.ForEach(q => { q.state = 2; });
+                var Receptionlist = await _db.Queryable<App_RemoteModel>().Where(q => q.Id==data.Id).ToListAsync();
+                Receptionlist.ForEach(q => {
+                    q.state = (int)data.state;
+                    if (data.sttime != null) q.sttime = data.sttime;
+                    if (data.ettime != null) q.ettime = data.ettime;
+                    q.reason = data.reason;
+                });
                 _db.BeginTran();
-                var num = await _db.Updateable(Receptionlist).ExecuteCommandAsync();
+                var num = await _db.Updateable(Receptionlist).IgnoreColumns(ignoreAllNullColumns: true).UpdateColumns(it => new { it.state, it.sttime,it.ettime,it.reason }).ExecuteCommandAsync();
                 _db.CommitTran();
                 if (num > 0)
                 {
                     result.IsSucceed = true;
-                    result.result = "已取消";
+                    result.result = "更改成功";
                 }
             }
             catch (System.Exception ex)
@@ -243,6 +217,7 @@ namespace _24Hour.Controllers.Common
                 _db.RollbackTran();
                 result.IsSucceed = false;
                 result.Message = ex.Message;
+                LogService.WriteLog(ex, "远程会见更改状态");
             }
             _logs.WriteSysLogadd("远程会见管理", "取消远程会见", result, _db);
             return result;
diff --git a/24Hour/Controllers/system/SystemControllerController.cs b/24Hour/Controllers/system/SystemControllerController.cs
index 15b4687..ab45e14 100644
--- a/24Hour/Controllers/system/SystemControllerController.cs
+++ b/24Hour/Controllers/system/SystemControllerController.cs
@@ -1,4 +1,5 @@
-using Elight.Entity;
+using com.sun.xml.@internal.ws.api.model;
+using Elight.Entity;
 using Elight.Logic;
 using Elight.Logic.SystemModel;
 using Elight.Utility;
@@ -211,6 +212,154 @@ namespace _24Hour.Controllers.system
             _logs.WriteSysLogadd("用户管理", "删除人员信息", result,_db);
             return result;
         }
+
+        /// <summary>
+        /// 启用用户
+        /// </summary>
+        /// <param name="info"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("EnableUser")]
+        public async Task<Result> EnableUser(CurrencyDelete Currency)
+        {
+            try
+            {
+                _db.BeginTran();
+                var userlist = await _db.Queryable<App_Sys_UserModel>().In(q => q.Id, Currency.id).ToListAsync();
+                userlist.ForEach(q =>
+                {
+                    q.isdeactivate = 0;
+                });
+                var num = await _db.Updateable(userlist).ExecuteCommandAsync();
+                _db.CommitTran();
+                if (num > 0)
+                {
+                    result.IsSucceed = true;
+                    result.result = "启用成功";
+                }
+            }
+            catch (System.Exception ex)
+            {
+                _db.RollbackTran();
+                result.IsSucceed = false;
+                result.Message = ex.Message;
+                LogService.WriteLog(ex, "用户启用");
+            }
+            _logs.WriteSysLogadd("用户管理", "启用人员信息", result, _db);
+            return result;
+        }
+
+        /// <summary>
+        /// 禁用用户
+        /// </summary>
+        /// <param name="info"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("DisableUser")]
+        public async Task<Result> DisableUser(CurrencyDelete Currency)
+        {
+            try
+            {
+                _db.BeginTran();
+                var userlist = await _db.Queryable<App_Sys_UserModel>().In(q => q.Id, Currency.id).ToListAsync();
+                userlist.ForEach(q =>
+                {
+                    q.isdeactivate = 1;
+                });
+                var num = await _db.Updateable(userlist).ExecuteCommandAsync();
+                _db.CommitTran();
+                if (num > 0)
+                {
+                    result.IsSucceed = true;
+                    result.result = "禁用成功";
+                }
+            }
+            catch (System.Exception ex)
+            {
+                _db.RollbackTran();
+                result.IsSucceed = false;
+                result.Message = ex.Message;
+                LogService.WriteLog(ex, "用户禁用");
+            }
+            _logs.WriteSysLogadd("用户管理", "禁用人员信息", result, _db);
+            return result;
+        }
+
+
+        /// <summary>
+        /// 用户重置密码
+        /// </summary>
+        /// <param name="info"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("resettingUser")]
+        public async Task<Result> resettingUser(CurrencyDelete Currency)
+        {
+            try
+            {
+                _db.BeginTran();
+                var userlist = await _db.Queryable<App_Sys_UserModel>().In(q => q.Id, Currency.id).ToListAsync();
+                userlist.ForEach(q =>
+                {
+                    //默认密码
+                    q.Password = Elight.Utility.Encrypt.Md5.Encrypt32($"mr123456").ToLower();
+                });
+                var num = await _db.Updateable(userlist).ExecuteCommandAsync();
+                _db.CommitTran();
+                if (num > 0)
+                {
+                    result.IsSucceed = true;
+                    result.result = "重置成功";
+                }
+            }
+            catch (System.Exception ex)
+            {
+                _db.RollbackTran();
+                result.IsSucceed = false;
+                result.Message = ex.Message;
+                LogService.WriteLog(ex, "用户重置密码");
+            }
+            _logs.WriteSysLogadd("用户管理", "重置密码", result, _db);
+            return result;
+        }
+
+
+        /// <summary>
+        /// 修改密码
+        /// </summary>
+        /// <param name="info"></param>
+        /// <returns></returns>
+        [HttpGet]
+        [Route("Changepass")]
+        public async Task<Result> Changepass()
+        {
+            try
+            {
+                _db.BeginTran();
+                var userlist = await _db.Queryable<App_Sys_UserModel>().Where(q=>q.IsDeleted==0&&q.Id==_userdata.Id).ToListAsync();
+                userlist.ForEach(q =>
+                {
+                    //默认密码
+                    q.Password = Elight.Utility.Encrypt.Md5.Encrypt32($"{q.Password}").ToLower();
+                });
+                var num = await _db.Updateable(userlist).ExecuteCommandAsync();
+                _db.CommitTran();
+                if (num > 0)
+                {
+                    result.IsSucceed = true;
+                    result.result = "重置成功";
+                }
+            }
+            catch (System.Exception ex)
+            {
+                _db.RollbackTran();
+                result.IsSucceed = false;
+                result.Message = ex.Message;
+                LogService.WriteLog(ex, "用户重置密码");
+            }
+            _logs.WriteSysLogadd("用户管理", "重置密码", result, _db);
+            return result;
+        }
         #endregion
 
         #region 角色管理
@@ -913,6 +1062,7 @@ namespace _24Hour.Controllers.system
                 _db.RollbackTran();
                 result.IsSucceed = false;
                 result.Message = ex.Message;
+                LogService.WriteLog(ex, "菜单添加");
             }
             _logs.WriteSysLogadd("菜单管理", "添加菜单信息", result,_db);
             return result;
@@ -943,6 +1093,7 @@ namespace _24Hour.Controllers.system
                 _db.RollbackTran();
                 result.IsSucceed = false;
                 result.Message = ex.Message;
+                LogService.WriteLog(ex, "菜单修改");
             }
             _logs.WriteSysLogadd("菜单管理", "修改菜单信息", result,_db);
             return result;
@@ -978,6 +1129,7 @@ namespace _24Hour.Controllers.system
                 _db.RollbackTran();
                 result.IsSucceed = false;
                 result.Message = ex.Message;
+                LogService.WriteLog(ex, "菜单删除");
             }
             _logs.WriteSysLogadd("菜单管理", "删除菜单信息", result,_db);
             return result;
diff --git a/Elight.Entity/AppMode/App_RemoteModel.cs b/Elight.Entity/AppMode/App_RemoteModel.cs
index d6793b0..0c32dce 100644
--- a/Elight.Entity/AppMode/App_RemoteModel.cs
+++ b/Elight.Entity/AppMode/App_RemoteModel.cs
@@ -42,6 +42,9 @@ namespace Elight.Entity
         [DataMember]
         public string? name { get; set; }
 
+        [DataMember]
+        public string? reason { get; set; }
+
         /// <summary>
         /// 开始时间
         /// </summary>
diff --git a/Elight.Logic/Model/App_RemoteState.cs b/Elight.Logic/Model/App_RemoteState.cs
new file mode 100644
index 0000000..17398fa
--- /dev/null
+++ b/Elight.Logic/Model/App_RemoteState.cs
@@ -0,0 +1,42 @@
+using Elight.Utility.Code;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Serialization;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Elight.Logic
+{
+    /// <summary>
+    /// 远程会见审核
+    /// </summary>
+    [DataContract]
+    public class App_RemoteState : Paging
+    {
+        [DataMember]
+        public string? Id { get; set; }
+
+        [DataMember]
+        public string? reason { get; set; }
+
+        /// <summary>
+        /// 开始时间
+        /// </summary>
+        [DataMember]
+        public DateTime? sttime { get; set; }
+        
+        /// <summary>
+        /// 结束时间
+        /// </summary>
+        [DataMember]
+        public DateTime? ettime { get; set; }
+
+        /// <summary>
+        /// 状态 0：待办理，1：同意，2:结束，3：取消
+        /// </summary>
+        [DataMember]
+        public int? state { get; set; }
+    }
+}