合并

ch

2022-03-10 5d9636ba5741f6ff79c9401bce2626469c35323d

 WebAPI/Controllers/BaseSet/Gy_SourceController.cs

@@ -32,41 +32,43 @@
        {
            try
            {
                //查看权限
                if (!DBUtility.ClsPub.Security_Log("Gy_Source", 1, false, user))
                //判断是否有查询权限
                if (!DBUtility.ClsPub.Security_Log("Gy_Source_Query", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无查看权限！";
                    objJsonResult.Message = "无权限查询!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_IF_SourceList where 1=1 ", "h_v_IF_SourceList");
                    ds = oCN.RunProcReturn("select * from h_v_IF_SourceList where 1=1 order by 生产资源代码 ", "h_v_IF_SourceList");
                }
                else
                {
                    string sql1 = "select * from h_v_IF_SourceList where 1=1 ";
                    string sql = sql1 + sWhere;
                    string sql = sql1 + sWhere+ " order by 生产资源代码 ";
                    ds = oCN.RunProcReturn(sql, "h_v_IF_SourceList");
                }
                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;
                //}
            }
            catch (Exception e)
            {