用户查询接口添加条件，查询不为admin的用户，角色用户添加接口调整

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();

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;