From e151e80cd95afe0480cc885b6481a43050ea5583 Mon Sep 17 00:00:00 2001
From: liujiaqiang <1448951783@qq.com>
Date: Wed, 28 Jun 2023 15:20:23 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=9F=A5=E8=AF=A2=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E6=B7=BB=E5=8A=A0=E6=9D=A1=E4=BB=B6=EF=BC=8C=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E4=B8=8D=E4=B8=BAadmin=E7=9A=84=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=EF=BC=8C=E8=A7=92=E8=89=B2=E7=94=A8=E6=88=B7=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 24Hour/Controllers/Common/CommonController.cs    | 16 ++++++++++++++++
 .../system/SystemControllerController.cs         |  4 ++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/24Hour/Controllers/Common/CommonController.cs b/24Hour/Controllers/Common/CommonController.cs
index 0df02f2..e47d716 100644
--- a/24Hour/Controllers/Common/CommonController.cs
+++ b/24Hour/Controllers/Common/CommonController.cs
@@ -1162,6 +1162,22 @@ namespace _24Hour.Controllers.Common
                         result.result = "修改成功";
                     }
                 }
+                //获取认罪认罚预约记录
+                var Confessiondata = await _db.Queryable<App_ConfessionModel>()
+                    .Where(q => q.Id == Id).ToArrayAsync();
+                if (Confessiondata.Count() > 0)
+                {
+                    Confessiondata.FirstOrDefault().meetwitId = userId;
+                    Confessiondata.FirstOrDefault().meetwitname = username;
+                    _db.BeginTran();
+                    var num = await _db.Updateable(Confessiondata.FirstOrDefault()).UpdateColumns(it => new { it.meetwitId, it.meetwitname }).ExecuteCommandAsync();
+                    _db.CommitTran();
+                    if (num > 0)
+                    {
+                        result.IsSucceed = true;
+                        result.result = "修改成功";
+                    }
+                }
                 //获取听证预约记录
                 var Hearingdata = await _db.Queryable<App_HearingModel>()
                     .Where(q => q.Id == Id).ToArrayAsync();
diff --git a/24Hour/Controllers/system/SystemControllerController.cs b/24Hour/Controllers/system/SystemControllerController.cs
index a80e6c8..f615ec2 100644
--- a/24Hour/Controllers/system/SystemControllerController.cs
+++ b/24Hour/Controllers/system/SystemControllerController.cs
@@ -45,7 +45,7 @@ namespace _24Hour.Controllers.system
         [Route("Querydepartment")]
         public async Task<Result> Querydepartment(string department)
         {
-            var Unitlist = await _db.Queryable<App_Sys_UserModel>().Where(q => q.IsDeleted == 0 && q.isdeactivate == 0 && q.department == department).ToListAsync();
+            var Unitlist = await _db.Queryable<App_Sys_UserModel>().Where(q => q.phone != "admin" && q.IsDeleted == 0 && q.isdeactivate == 0 && q.department == department).ToListAsync();
             result.IsSucceed = true;
             result.result = Unitlist.OrderByDescending(q => q.createtime).ToList();
             return result;
@@ -59,7 +59,7 @@ namespace _24Hour.Controllers.system
         [Route("QueryUserlist")]
         public async Task<Result> QueryUserlist()
         {
-            var Unitlist = await _db.Queryable<App_Sys_UserModel>().Where(q => q.IsDeleted == 0 && q.isdeactivate == 0 && q.usertype == 0 && q.unitCode == _userdata.unitCode).ToListAsync();
+            var Unitlist = await _db.Queryable<App_Sys_UserModel>().Where(q => q.IsDeleted == 0 && q.isdeactivate == 0 && q.usertype == 0 && q.unitCode == _userdata.unitCode && q.phone != "admin").ToListAsync();
             result.IsSucceed = true;
             result.result = Unitlist.OrderByDescending(q => q.createtime).ToList();
             return result;