暂存

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -4688,17 +4688,14 @@ namespace MySystem.Areas.Admin.Controllers
                     {
                         info = "机具" + PosSn + "所对应的商户未认证";
                     }
+                    var merchantId = db.PosMerchantInfo.Where(m => m.MerIdcardNo == mer.MerIdcardNo && m.MerRealName == mer.MerRealName && m.MerchantMobile == mer.MerchantMobile).Min(m => m.Id);
+                    if (mer.Id <= merchantId)
+                    {
+                        IsFirst = "首台";
+                    }
                     else
                     {
-                        var merchantId = db.PosMerchantInfo.Where(m => m.MerIdcardNo == mer.MerIdcardNo && m.MerRealName == mer.MerRealName && m.MerchantMobile == mer.MerchantMobile).Min(m => m.Id);
-                        if (mer.Id <= merchantId)
-                        {
-                            IsFirst = "首台";
-                        }
-                        else
-                        {
-                            IsFirst = "非首台";
-                        }
+                        IsFirst = "非首台";
                     }
                     var depositRreturn = db.MerchantDepositReturns.Where(m => m.MerchantId == mer.Id).OrderByDescending(m => m.CreateDate).FirstOrDefault() ?? new MerchantDepositReturns();
                     var IsOk = "";//是否达标
@@ -4735,10 +4732,7 @@ namespace MySystem.Areas.Admin.Controllers
                         }
                     }
                     result += info + "\n";
-                    if (!string.IsNullOrEmpty(info))
-                    {
-                        result += IsFirst + "\n";
-                    }
+                    result += IsFirst + "\n";
                     result += IsOk + "\n";
                     result += "开机时间：" + DateTime.Parse(pos.BindingTime.ToString()).ToString("yyyy-MM-dd HH:mm:ss") + "\n";
                     result += "激活时间：" + DateTime.Parse(pos.ActivationTime.ToString()).ToString("yyyy-MM-dd HH:mm:ss") + "\n";