合并

yangle

2022-03-30 3fc6d151b007c06080ae32a90b5d939dd8f92eab

 WebAPI/Controllers/BaseSet/Gy_ProcessController.cs

@@ -322,8 +322,8 @@
                long HDeptID = list[0].HDeptID;
                long HProcID = list[0].HProcID;

                ////判断权限
                //if (!ClsPub.Security_Log(msg5, 1, false, msg4))
                //判断权限
                //if (!ClsPub.Security_Log("Gy_Process_Edit", 1, false, msg3))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
@@ -428,42 +428,43 @@
        {
            try
            {
                //判断是否有查询权限
                //查看权限
                if (!DBUtility.ClsPub.Security_Log("Gy_Process_Query", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无权限查询!";
                    objJsonResult.Message = "无查看权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_Gy_ProcessList " + sWhere, "h_v_Gy_ProcessList");
                    ds = oCN.RunProcReturn("select * from h_v_Gy_ProcessList order by 工序代码 ", "h_v_Gy_ProcessList");
                }
                else
                {
                    string sql1 = "select * from h_v_Gy_ProcessList where 1 = 1 ";
                    string sql = sql1 + sWhere;
                    string sql = sql1 + sWhere+ " order by 工序代码 ";
                    ds = oCN.RunProcReturn(sql, "h_v_Gy_ProcessList");
                }
                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)
            {
@@ -521,19 +522,18 @@
        /// <returns></returns>
        [Route("DeltetGy_Process")]
        [HttpGet]
        public object DeltetGy_Process(string HItemID,string user)
        public object DeltetGy_Process(string HItemID, string user)
        {
            DataSet ds;
            DataSet ds1;
            string ModRightNameCheck = "Gy_Process_Delete";
            try
            {
                //删除权限
                if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, user))
                if (!DBUtility.ClsPub.Security_Log("Gy_Process_Delete", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无权限删除！";
                    objJsonResult.Message = "无删除权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }