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

wtt

2 天以前 2fd658134344c18e9f2a2eb2c2099d0b0edf205a

 WebAPI/Controllers/BaseSet/Gy_DriverController.cs

@@ -37,15 +37,15 @@
            try
            {
                List<object> columnNameList = new List<object>();
                ////查看权限
                //if (!DBUtility.ClsPub.Security_Log("Gy_Department", 1, false, user))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "无查看权限";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                //查看权限
                if (!DBUtility.ClsPub.Security_Log("Gy_Driver_Query", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无查看权限";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                //string sql1 = string.Format(@"select * from h_v_IF_DepartmentList where 组织名称='" + Organization + "'");
                string sql1 = string.Format(@"select * from h_v_Gy_driver where 1=1 ");
                if (sWhere == null || sWhere.Equals(""))
@@ -232,14 +232,14 @@
            try
            {
                ////删除权限
                //if (!DBUtility.ClsPub.Security_Log("Gy_Department_Delete", 1, false, user))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "无删除权限";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                if (!DBUtility.ClsPub.Security_Log("Gy_Driver_Delete", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无删除权限";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                if (string.IsNullOrWhiteSpace(HItemID))
@@ -479,7 +479,7 @@
                //string msg5 = sArray[3].ToString();

                //编辑权限
                if (!DBUtility.ClsPub.Security_Log_second("Gy_Department_Edit", 1, false, msg3))
                if (!DBUtility.ClsPub.Security_Log_second("Gy_Driver_Edit", 1, false, msg3))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -501,7 +501,7 @@
                string HHelpCode = list[0].HHelpCode;
                string HModifyEmp = msg3;
                string HMakeEmp = msg3;
                bool HStopflag = list[0].HStopflag==null?false:true;
                int  HStopflag = list[0].HStopflag==0?0:1;
                long HCREATEORGID = list[0].HCREATEORGID;
                long HUSEORGID = HUSEORGID_1;
                long HCompID = list[0].HCompID;
@@ -577,7 +577,7 @@
                        " (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
                        ",HLevel,HEndFlag,HStopflag,HRemark,HUSEORGID,HCREATEORGID,HMakeEmp,HMakeTime,HIDCard,HPhone,HDriverCardPic,HDriverCardType,HIDCardPic,HEmpType,HCompID) " +
                        " Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() +
                        "," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "'"   +
                        "," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + HStopflag + ",'" + HRemark + "'"   +
                          "," + HUSEORGID + "," + HCREATEORGID + ",'" + msg3 + "',getdate()," +"'"+ HIDCard +"',"+  
                          "'"+ HPhone+"','"+ HDriverCardPic+"','"+ HDriverCardType + "','"+ HIDCardPic +"','"+ HEmpType+"',"+ HCompID+
                          ")", ref DBUtility.ClsPub.sExeReturnInfo);
@@ -611,7 +611,7 @@
                        ",HParentID=" + HParentID +
                        ",HUSEORGID=" + HUSEORGID.ToString() +
                        ",HCREATEORGID=" + HCREATEORGID.ToString() +
                        ",HStopflag=" + Convert.ToString(HStopflag ? 1 : 0) +
                        ",HStopflag=" + HStopflag +
                        ",HModifyEmp='" + HModifyEmp + "'" +
                        ",HModifyTime='" + DateTime.Now + "'" +
                        ",HIDCard='" + HIDCard + "'" +
@@ -621,7 +621,6 @@
                        ",HIDCardPic='" + HIDCardPic + "'" +
                        ",HEmpType='" + HEmpType + "'" +
                        ",HCompID=" + HCompID + "" +


                        ",HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
                    //修改子项目代码
@@ -989,15 +988,15 @@
        {
            try
            {
                ////审核权限
                //if (!DBUtility.ClsPub.Security_Log_second("Gy_Department_Check", 1, false, CurUserName))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "审核失败！无权限！";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                //审核权限
                if (!DBUtility.ClsPub.Security_Log_second("Gy_Driver_Check", 1, false, CurUserName))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "审核失败！无权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                var ds = oCN.RunProcReturn("select * from Gy_Driver where HItemID=" + HInterID, "Gy_Driver");
                if (ds.Tables[0].Rows.Count > 0)