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

ch

2022-10-28 45334377dbbe7f6c0132f4b9c581b1a3fa133861

 WebAPI/Controllers/BaseSet/Gy_OrderLevController.cs

@@ -1,4 +1,5 @@
using DBUtility;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
@@ -27,36 +28,56 @@
        /// </summary>
        [Route("Gy_OrderLev/list")]
        [HttpGet]
        public object list(string sWhere)
        public object list(string sWhere,string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //编辑权限
                if (!DBUtility.ClsPub.Security_Log_second("Gy_OrderLev", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无查看权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_Gy_OrderLevList " + sWhere, "h_v_Gy_OrderLevList");
                    ds = oCN.RunProcReturn("select * from h_v_Gy_OrderLevList " + sWhere+ " order by 订单等级代码", "h_v_Gy_OrderLevList");
                }
                else
                {
                    string sql1 = "select * from h_v_Gy_OrderLevList where 1 = 1 ";
                    string sql = sql1 + sWhere;
                    string sql = sql1 + sWhere+ " order by 订单等级代码";
                    ds = oCN.RunProcReturn(sql, "h_v_Gy_OrderLevList");
                }
                if (ds == null || ds.Tables[0].Rows.Count == 0)

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "false！";
                    objJsonResult.data = null;
                    return objJsonResult;
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }
                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];
                objJsonResult.list = columnNameList;
                return objJsonResult;
                //}
                //else
                //{
                //objJsonResult.code = "0";
                //objJsonResult.count = 0;
                //objJsonResult.Message = "无数据";
                //objJsonResult.data = null;
                //return objJsonResult;
                //}
            }
            catch (Exception e)
            {
@@ -126,7 +147,7 @@
            DAL.ClsGy_OrderLev_View oDeptHlp = new DAL.ClsGy_OrderLev_View();
            try
            {
                if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, true, User))
                if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, false, User))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -206,7 +227,11 @@
            try
            {
                var _value = oMain["oMain"].ToString();
                string msg1 = _value.ToString();
                string msg3 = _value.ToString();
                string[] sArray = msg3.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
                string msg1 = sArray[0].ToString();
                string msg2 = sArray[1].ToString();

                //反序列化
                msg1 = "[" + msg1.ToString() + "]";
 
@@ -227,7 +252,17 @@
                string HYX = list[0].HYX;
                bool HStopflag = list[0].HStopflag;
                bool HUseFlag = list[0].HUseFlag;
 

                //编辑权限
                if (!DBUtility.ClsPub.Security_Log_second("Gy_VipLevel_Edit", 1, false, msg2))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无保存权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                if (!DBUtility.ClsPub.AllowNumber(HNumber))
                {
                    objJsonResult.code = "0";
@@ -310,11 +345,11 @@
 
 
                //判断权限
                if (!ClsPub.Security_Log(msg5, 1, true, msg4))
                if (!ClsPub.Security_Log(msg5, 1, false, msg4))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有找到该功能模块！";
                    objJsonResult.Message = "无保存权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }