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

yusijie

2022-11-25 494c68c9ad1cc3b085c27e87865269c4593c24e8

 WebAPI/Controllers/GZGL/Gy_WorkPayTypeBillController.cs

@@ -28,36 +28,45 @@
        /// </summary>
        [Route("Gy_WorkPayTypeBill/GetWorkPayTypelist")]
        [HttpGet]
        public object GetWorkPayTypelist(string sWhere)
        public object GetWorkPayTypelist(string sWhere,string user)
        {
            try
            {
                if (!DBUtility.ClsPub.Security_Log("Gy_WorkPayType", 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_WorkPayTypeList " + sWhere, "h_v_Gy_WorkPayTypeList");
                    ds = oCN.RunProcReturn("select * from h_v_Gy_WorkPayTypeList order by 工资类型代码 ", "h_v_Gy_WorkPayTypeList");
                }
                else
                {
                    string sql1 = "select * from h_v_Gy_WorkPayTypeList where 1 = 1 ";
                    string sql = sql1 + sWhere;
                    string sql = sql1 + sWhere+ " order by 工资类型代码 ";
                    ds = oCN.RunProcReturn(sql, "h_v_Gy_WorkPayTypeList");
                }
                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)
            {
@@ -78,8 +87,16 @@
        /// </summary>
        [Route("Gy_WorkPayTypeBill/Delete_Json")]
        [HttpGet]
        public object Delete_Json(string HInterID)
        public object Delete_Json(string HInterID,string user)
        {
            if (!DBUtility.ClsPub.Security_Log("Gy_WorkPayType_Delete", 1, false, user))
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "无删除权限！";
                objJsonResult.data = null;
                return objJsonResult;
            }
            //用id查到该对象
            string sql = "select * from Gy_WorkPayType where HItemID =  " + HInterID;
            ds = oCN.RunProcReturn(sql, "Gy_WorkPayType");
@@ -160,11 +177,21 @@
            string msg1 = _value.ToString();
            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string msg2 = sArray[0].ToString();
            string msg4 = sArray[2].ToString();

            ListModels oListModels = new ListModels();

            try
            {
                if (!DBUtility.ClsPub.Security_Log("Gy_WorkPayType_Edit", 1, false, msg4))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无保存权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                DLL.ClsGy_WorkPayTypeBill oBill = new DLL.ClsGy_WorkPayTypeBill();
                List<Model.ClsGy_WorkPayType_Model> lsmain = new List<Model.ClsGy_WorkPayType_Model>();
                msg2 = msg2.Replace("\\", "");