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

ch

2022-01-23 274db11b6606fb03bf269c73d9aa1722e92d23a1

 WebAPI/Controllers/工资管理/Gy_GroupEmpBillController.cs

@@ -28,11 +28,18 @@
        /// </summary>
        [Route("Gy_GroupEmpBill/GetGroupEmpBill")]
        [HttpGet]
        public object GetGroupEmpBill(string sWhere)
        public object GetGroupEmpBill(string sWhere,string user)
        {
            try
            {

                if (!DBUtility.ClsPub.Security_Log("Gy_Group", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                ds = Sc_GetGroupEmpBill(sWhere);
                objJsonResult.code = "1";
                objJsonResult.count = 1;
@@ -129,7 +136,7 @@
            string msg2 = sArray[0].ToString();
            string msg3 = sArray[1].ToString();
            string refSav = sArray[2].ToString();
            //string msg4 = sArray[3].ToString();
            string msg4 = sArray[3].ToString();

            string UserName = "";
            string s = "";
@@ -137,15 +144,15 @@
            ListModels oListModels = new ListModels();
            try
            {
                ////缂栬緫鏉冮檺
                //if (!DBUtility.ClsPub.Security_Log_second("Gy_GroupEmpBill_Edit", 1, false, msg4))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                //缂栬緫鏉冮檺
                if (!DBUtility.ClsPub.Security_Log_second("Gy_Group_Edit", 1, false, msg4))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                DLL.ClsGy_GroupEmpBill oBill = new DLL.ClsGy_GroupEmpBill();
                List<Models.ClsGy_GroupEmpListMain> lsmain = new List<Models.ClsGy_GroupEmpListMain>();
@@ -234,10 +241,18 @@
        /// <returns></returns>
        [Route("Gy_GroupEmpBill/DeltetGroupEmpBill")]
        [HttpGet]
        public object DeltetGroupEmpBill(string HInterID)
        public object DeltetGroupEmpBill(string HInterID,string user)
        {
            try
            {
                if (!DBUtility.ClsPub.Security_Log("Gy_Group_Delete", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                oCN.BeginTran();
                oCN.RunProc("Delete From Gy_GroupEmpListMain where HInterID = " + HInterID);
                oCN.RunProc("Delete From Gy_GroupEmpListSub where HInterID = " + HInterID);