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

ch

2022-05-24 22971886a0e1897aabf62b228215bbee3f2d5a6c

 WebAPI/Controllers/BaseSet/Gy_GroupController.cs

@@ -42,30 +42,31 @@

                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_GroupList " + sWhere, "h_v_GroupList");
                    ds = oCN.RunProcReturn("select * from h_v_GroupList " + sWhere+ " order by 班组代码 ", "h_v_GroupList");
                }
                else
                {
                    string sql1 = "select * from h_v_GroupList where 1 = 1 ";
                    string sql = sql1 + sWhere;
                    string sql = sql1 + sWhere+ " order by 班组代码 ";
                    ds = oCN.RunProcReturn(sql, "h_v_GroupList");
                }
                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)
            {
@@ -253,9 +254,20 @@
                string msg1 = _value.ToString();
                string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
                string msg2 = sArray[0].ToString();
                string msg3 = sArray[1].ToString();
                string msg4 = sArray[2].ToString();
                string msg5 = sArray[3].ToString();
                string user = sArray[1].ToString();//用户名
                //string msg4 = sArray[2].ToString();
                //string msg5 = sArray[3].ToString();

                //判断是否有编辑权限
                if (!DBUtility.ClsPub.Security_Log("Gy_Group_Edit", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无编辑权限!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                //反序列化
                msg2 = "[" + msg2.ToString() + "]";
                List<Gy_Group> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_Group>>(msg2);
@@ -280,14 +292,14 @@
                //var HProcID = "";

                //判断权限
                if (!ClsPub.Security_Log(msg5, 1, false, msg4))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无保存权限";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                //if (!ClsPub.Security_Log(msg5, 1, false, msg4))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "无保存权限";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}

                //if (!DBUtility.ClsPub.AllowNumber(HNumber))
                //{
@@ -462,7 +474,7 @@
        {
            DataSet ds;
            DataSet ds1;
            //string ModRightNameCheck = "Sc_ProcessReport_check";
            string ModRightNameCheck = "Gy_Group_Delete";
            try
            {
                //删除权限