机具产生交易额后不能解绑

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -2163,6 +2163,10 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 return "机具绑定已超过30天，不支持解绑";
             }
+            if (pos.CreditTrade > 0)
+            {
+                return "该机具已交易，无法解绑";
+            }
             if (forMerNo != null)
             {
                 PosMerchantInfo merchant = db.PosMerchantInfo.FirstOrDefault(m => m.Id == pos.BindMerchantId);

Areas/Admin/Controllers/MainServer/UsersController.cs

@@ -2210,19 +2210,19 @@ namespace MySystem.Areas.Admin.Controllers
             }
             if (!string.IsNullOrEmpty(IsLeader))
             {
-                condition += " and LeaderLeave=" + IsLeader;
+                condition += " and LeaderLevel=" + IsLeader;
             }
             if (!string.IsNullOrEmpty(UserYsLevel))
             {
                 var UserIds = "";
                 var Rank = int.Parse(UserYsLevel);
-                DataTable dts = CustomerSqlConn.dtable("SELECT UserId FROM UserRankWhite WHERE Status>-1 and Rank=" + Rank + "", SqlConn);
-                foreach (var item in dts.Rows)
+                var list = db.UserRankWhite.Where(m => m.Status > -1 && m.Rank == Rank).ToList();
+                foreach (var item in list)
                 {
-                    UserIds += item + ",";
+                    UserIds += item.UserId + ",";
                 }
                 UserIds = UserIds.TrimEnd(',');
-                condition += " or Id IN(" + UserIds + ")";
+                condition += " and Id IN(" + UserIds + ")";
             }
             if (!string.IsNullOrEmpty(UserLevel))
             {
@@ -2232,18 +2232,18 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 var UserIds = "";
                 DataTable dt = CustomerSqlConn.dtable("SELECT UserId FROM SysAdmin WHERE Status>-1 and Sort>0 and QueryCount>0 and AdminName!='admin'", OpConn);
-                foreach (var item in dt.Rows)
+                foreach (DataRow item in dt.Rows)
                 {
-                    UserIds += item + ",";
+                    UserIds += item["UserId"].ToString() + ",";
                 }
                 UserIds = UserIds.TrimEnd(',');
                 if (IsOp == "1")
                 {
-                    condition += " or Id IN(" + UserIds + ")";
+                    condition += " and Id IN(" + UserIds + ")";
                 }
                 if (IsOp == "2")
                 {
-                    condition += " or Id NOT IN(" + UserIds + ")";
+                    condition += " and Id NOT IN(" + UserIds + ")";
                 }
             }
             if (!string.IsNullOrEmpty(CreateDateData))