合并

ch

2022-03-10 5d9636ba5741f6ff79c9401bce2626469c35323d

 WebAPI/Controllers/BaseSet/Gy_CurrencyController.cs

@@ -43,12 +43,12 @@

                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_Gy_CurrencyList where 禁用标记=''" + sWhere, "h_v_Gy_CurrencyList");
                    ds = oCN.RunProcReturn("select * from h_v_Gy_CurrencyList where 禁用标记=''" + sWhere+ " order by 货币代码", "h_v_Gy_CurrencyList");
                }
                else
                {
                    string sql1 = "select * from h_v_Gy_CurrencyList where 禁用标记='' ";
                    string sql = sql1 + sWhere;
                    string sql = sql1 + sWhere+ " order by 货币代码";
                    ds = oCN.RunProcReturn(sql, "h_v_Gy_CurrencyList");
                }
                if (ds == null || ds.Tables[0].Rows.Count == 0)
@@ -86,22 +86,23 @@
            SQLHelper.ClsCN SubCn = new SQLHelper.ClsCN();
            //ds = oCN.RunProcReturn("select * from h_v_IF_GroupList " + sWhere, "h_v_IF_GroupList");
            ds = oCN.RunProcReturn("select * from h_v_CurrencyLoadTree", "h_v_CurrencyLoadTree");
            if (ds == null || ds.Tables[0].Rows.Count == 0)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "false！";
                objJsonResult.data = null;
                return objJsonResult;
            }
            else
            {
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
            }

            //if (ds.Tables[0].Rows.Count != 0 || ds != null)
            //{
            objJsonResult.code = "1";
            objJsonResult.count = 1;
            objJsonResult.Message = "Sucess！";
            objJsonResult.data = ds.Tables[0];
            return objJsonResult;
            //}
            //else
            //{
            //objJsonResult.code = "0";
            //objJsonResult.count = 0;
            //objJsonResult.Message = "无数据";
            //objJsonResult.data = null;
            //return objJsonResult;
            //}
        }