暂存

Areas/Admin/Controllers/MainServer/UsersController.cs

@@ -2534,17 +2534,17 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 if (!string.IsNullOrEmpty(PosSns))
                 {
-                    string[] PosSnsList = PosSns.Replace("\r", "").Replace("\n", ",").Split(',');
+                    string[] PosSnsList = PosSns.Replace("\r", "").Replace("\n", ",").Replace(" ", ",").Split(',');
                     foreach (string PosSn in PosSnsList)
                     {
                         Dictionary<string, object> data = new Dictionary<string, object>();
                         var pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == PosSn) ?? new PosMachinesTwo();
-                        if (pos.Id == 0)
-                        {
-                            error += "机具" + PosSn + "不存在\n";
-                        }
-                        else
+                        if (pos.Id > 0)
                         {
+                            //     error += "机具" + PosSn + "不存在" + '\n';
+                            // }
+                            // else
+                            // {
                             var TopMakerCode = ""; //顶级创客编号
                             var TopRealName = ""; //顶级创客名称
                             var SecondMakerCode = ""; //次顶级创客编号
@@ -2606,23 +2606,23 @@ namespace MySystem.Areas.Admin.Controllers
                             data["SecondRealName"] = SecondRealName; //次顶级创客姓名
                             data["ThirdMakerCode"] = ThirdMakerCode; //次次顶级创客编号
                             data["ThirdRealName"] = ThirdRealName; //次次顶级创客姓名
+                            dataList.Add(data);
                         }
-                        dataList.Add(data);
                     }
                 }
                 if (!string.IsNullOrEmpty(MerNos))
                 {
-                    string[] MerNosList = MerNos.Replace("\r", "").Replace("\n", ",").Split(',');
+                    string[] MerNosList = MerNos.Replace("\r", "").Replace("\n", ",").Replace(" ", ",").Split(',');
                     foreach (string MerNo in MerNosList)
                     {
                         Dictionary<string, object> data = new Dictionary<string, object>();
                         var mer = db.PosMerchantInfo.FirstOrDefault(m => m.KqMerNo == MerNo) ?? new PosMerchantInfo();
-                        if (mer.Id == 0)
-                        {
-                            error += "商户" + MerNo + "不存在\n";
-                        }
-                        else
+                        if (mer.Id > 0)
                         {
+                            //     error += "商户" + MerNo + "不存在" + '\n';
+                            // }
+                            // else
+                            // {
                             var TopMakerCode = ""; //顶级创客编号
                             var TopRealName = ""; //顶级创客名称
                             var SecondMakerCode = ""; //次顶级创客编号
@@ -2684,16 +2684,10 @@ namespace MySystem.Areas.Admin.Controllers
                             data["SecondRealName"] = SecondRealName; //次顶级创客姓名
                             data["ThirdMakerCode"] = ThirdMakerCode; //次次顶级创客编号
                             data["ThirdRealName"] = ThirdRealName; //次次顶级创客姓名
+                            dataList.Add(data);
                         }
-                        dataList.Add(data);
                     }
                 }
-                if (!string.IsNullOrEmpty(error))
-                {
-                    errorInfo.Add("code", -1);
-                    errorInfo.Add("msg", error);
-                    return Json(errorInfo);
-                }
             }
             Dictionary<string, object> obj = new Dictionary<string, object>();
             obj.Add("code", 0);