Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

zrg

2024-03-06 bb48e7fb2979e4cb57a2fe6b744ae58016936d25

 WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs

@@ -2218,29 +2218,7 @@
                }
                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() + ")";
                            }
                        }
                    }

                    //sWhere = " and 1=1 ";
                    sWhere = " and HCusID in (select hcusid from Gy_UserCustomerRelation Where HUserID = '" + CurUserID + "') ";
                }

                objJsonResult.code = "1";