合并

ch

2022-03-10 5d9636ba5741f6ff79c9401bce2626469c35323d

 WebAPI/Controllers/SBGL/Sb_EquipDotCheckRuleBillController.cs

@@ -46,22 +46,23 @@
                    string sql = sql1 + sWhere + " order by hmainid desc";
                    ds = oCN.RunProcReturn(sql, "h_v_Sb_EquipDotCheckRuleList");
                }
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有你要找的记录！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {

                //if (ds.Tables[0].Rows.Count != 0 || ds != null)
                //{
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "返回记录成功！";
                objJsonResult.Message = "Sucess！";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }
                //}
                //else
                //{
                //objJsonResult.code = "0";
                //objJsonResult.count = 0;
                //objJsonResult.Message = "无数据";
                //objJsonResult.data = null;
                //return objJsonResult;
                //}
            }
            catch (Exception ex)
            {