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

yangle

2024-05-27 b56eb514c93264c1a829fdc05426a7e364879271

 WebAPI/Controllers/MJGL/Sc_MouldLifeUseBillController.cs

@@ -533,7 +533,7 @@
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        [Route("Sc_MouldLifeUseReport/list")]
        [Route("Sc_MouldLifeUseReport/GetSc_MouldLifeUseReport")]
        [HttpGet]
        public object GetSc_MouldLifeUseReport(string sWhere, string user, string userid)
        {
@@ -541,14 +541,14 @@
            {
                List<object> columnNameList = new List<object>();
                ////查看权限
                if (!DBUtility.ClsPub.Security_Log("Sc_MouldLifeUseReport_Query", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无查看权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                //if (!DBUtility.ClsPub.Security_Log("Sc_MouldLifeUseReport_Query", 1, false, user))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "无查看权限！";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}


                //查询