From 336353d20184dc995d51f14ba020195a1e497d37 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 28 十二月 2023 11:01:44 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs |   44 ++++++++++++++++++++++----------------------
 1 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs b/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs
index 81d8fa5..b33599b 100644
--- a/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs
+++ b/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs
@@ -1914,29 +1914,29 @@
                 }
                 else
                 {
-                    //string sql = "select * from Gy_UserCustomerRelation where HUserID = '" + CurUserID + "'";
-                    //ds = oCN.RunProcReturn(sql, "Gy_UserCustomerRelation");
-                    //if (ds == null || ds.Tables[0].Rows.Count == 0)
-                    //{
-                    //    sWhere = " and 1 = 0";
-                    //}
-                    //else
-                    //{
-                    //    sWhere = " and HCusID in (";
-                    //    for(var i = 0; i < ds.Tables[0].Rows.Count; i++)
-                    //    {
-                    //        if (i < ds.Tables[0].Rows.Count - 1)
-                    //        {
-                    //            sWhere += ds.Tables[0].Rows[i]["HCusID"].ToString() + ",";
-                    //        }
-                    //        else
-                    //        {
-                    //            sWhere += ds.Tables[0].Rows[i]["HCusID"].ToString() + ")";
-                    //        }
-                    //    }
-                    //}
+                    string sql = "select * from Gy_UserCustomerRelation where HUserID = '" + CurUserID + "'";
+                    ds = oCN.RunProcReturn(sql, "Gy_UserCustomerRelation");
+                    if (ds == null || ds.Tables[0].Rows.Count == 0)
+                    {
+                        sWhere = " and 1 = 0";
+                    }
+                    else
+                    {
+                        sWhere = " and HCusID in (";
+                        for (var i = 0; i < ds.Tables[0].Rows.Count; i++)
+                        {
+                            if (i < ds.Tables[0].Rows.Count - 1)
+                            {
+                                sWhere += ds.Tables[0].Rows[i]["HCusID"].ToString() + ",";
+                            }
+                            else
+                            {
+                                sWhere += ds.Tables[0].Rows[i]["HCusID"].ToString() + ")";
+                            }
+                        }
+                    }
 
-                    sWhere = " and 1=1 ";
+                    //sWhere = " and 1=1 ";
                 }
 
                 objJsonResult.code = "1";

--
Gitblit v1.9.1