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

yusijie

2025-01-09 c34e85eda515636993b37a752b52c0f43ae6e17b

 WebAPI/Controllers/BaseSet/Gy_SourceController.cs

@@ -38,14 +38,14 @@
            {
                List<object> columnNameList = new List<object>();
                //判断是否有查询权限
                //if (!DBUtility.ClsPub.Security_Log("Gy_Source_Query", 1, false, user))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "无权限查询!";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                if (!DBUtility.ClsPub.Security_Log("Gy_Source_Query", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无权限查询!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                if (sWhere == null || sWhere.Equals(""))
                {
@@ -110,15 +110,15 @@
            string msg1 = sArray[0].ToString();
            string msg2 = sArray[1].ToString();

            ////查看权限
            //if (!DBUtility.ClsPub.Security_Log("Gy_Source_Edit", 1, false, msg2))
            //{
            //    objJsonResult.code = "0";
            //    objJsonResult.count = 0;
            //    objJsonResult.Message = "无保存权限！";
            //    objJsonResult.data = null;
            //    return objJsonResult;
            //}
            //查看权限
            if (!DBUtility.ClsPub.Security_Log("Gy_Source_Edit", 1, false, msg2))
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "无保存权限！";
                objJsonResult.data = null;
                return objJsonResult;
            }

            Int64 HItemID = 0;
            SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
@@ -676,7 +676,7 @@
        {
            try
            {
                string sql1 = string.Format("select hitemid,hnumber,hname from Gy_Source"+ sWhere + " order by hnumber");
                string sql1 = string.Format("select hitemid,hnumber,hname,HUSEORGID from Gy_Source" + sWhere + " order by hnumber");

                ds = oCN.RunProcReturn(sql1, "Gy_Source");