Merge branch 'feature-常见问题' into develop

AppStart/Helper/SycnSpServer/SycnSpMerchantService.cs

@@ -37,9 +37,9 @@ namespace MySystem
                         var tran = db.Database.BeginTransaction();
                         try
                         {
-                            PxcModels.MachineForMerNo posFor = db.MachineForMerNo.FirstOrDefault(m => m.MerNo == Mer.MerNo) ?? new PxcModels.MachineForMerNo();
-                            PxcModels.PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == posFor.SnId) ?? new PxcModels.PosMachinesTwo();
-                            if (pos.BindingState == 1)
+                            // PxcModels.MachineForMerNo posFor = db.MachineForMerNo.FirstOrDefault(m => m.MerNo == Mer.MerNo) ?? new PxcModels.MachineForMerNo();
+                            PxcModels.PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == Mer.SnNo) ?? new PxcModels.PosMachinesTwo();
+                            if (pos.BindingState == 1 && Mer.Field2 != "解绑")
                             {
                                 PxcModels.Users user = db.Users.FirstOrDefault(m => m.Id == pos.UserId) ?? new PxcModels.Users();
                                 int TopUserId = 0;