合并

ch

2022-03-10 5d9636ba5741f6ff79c9401bce2626469c35323d

 WebAPI/Controllers/BaseSet/Xt_ORGANIZATIONSController.cs

@@ -25,37 +25,35 @@
        /// </summary>
        [Route("Xt_ORGANIZATIONS/list")]
        [HttpGet]
        public object list(string sWhere)
        public object list(string sWhere,string user, string Organization)
        {
            try

            {
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_IF_ORGANIZATIONSList " + sWhere, "h_v_IF_ORGANIZATIONSList");
                }
                else
                {
                    string sql1 = "select * from h_v_IF_ORGANIZATIONSList where 1 = 1 ";
                    string sql = sql1 + sWhere;
                    ds = oCN.RunProcReturn(sql, "h_v_IF_ORGANIZATIONSList");
                }
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                //编辑权限
                if (!DBUtility.ClsPub.Security_Log_second("Gy_WorkCenter_Query", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有返回任何记录！";
                    objJsonResult.Message = "无查看权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                string sql1 = string.Format(@"select * from h_v_IF_ORGANIZATIONSList where 组织名称='" + Organization + "'");
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn(sql1 + sWhere + " order by 组织代码 ", "h_v_IF_ORGANIZATIONSList");
                }
                else
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "Sucess！";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                    string sql = sql1 + sWhere + " order by 组织代码 ";
                    ds = oCN.RunProcReturn(sql, "h_v_IF_ORGANIZATIONSList");
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
            }
            catch (Exception e)
            {
@@ -86,12 +84,12 @@
                long HItemID = list[0].HItemID;
                string HNumber = list[0].HNumber;
                string HName = list[0].HName;
              

                long HParentID = list[0].HParentID;
               

                string HRemark = list[0].HRemark;
                bool HStopflag = list[0].HStopflag;
              

                if (!DBUtility.ClsPub.AllowNumber(HNumber))
                {
                    objJsonResult.code = "0";
@@ -151,7 +149,7 @@
                string msg1 = _value.ToString();
                string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
                string msg2 = sArray[0].ToString();
                //string msg3 = sArray[1].ToString();
                string msg3 = sArray[1].ToString();
                //string msg4 = sArray[2].ToString();
                //string msg5 = sArray[3].ToString();
                //反序列化
@@ -167,15 +165,15 @@
                string HRemark = list[0].HRemark;
                bool HStopflag = list[0].HStopflag;

                ////判断权限
                //if (!ClsPub.Security_Log(msg5, 1, true, msg4))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "没有找到该功能模块！";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                //判断权限
                if (!ClsPub.Security_Log("Gy_WorkCenter_Edit", 1, false, msg3))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有找到该功能模块！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                //if (!DBUtility.ClsPub.AllowNumber(HNumber))
                //{
@@ -204,7 +202,7 @@
                   ",HStopflag,HMakeTime" +
                   ",HRemark) " +
                   " Values('" + HNumber + "','" + HName + "'," + HParentID.ToString() +
                   "," + HStopflag + "getdate()"+
                   "," + HStopflag + "getdate()" +
                   ",'" + HRemark + "')", ref DBUtility.ClsPub.sExeReturnInfo);

                    //修改上级为非末级代码
@@ -247,7 +245,7 @@
        /// </summary>
        /// <returns></returns>
        [Route("DeltetXt_ORGANIZATIONSList")]
        

        [HttpGet]
        public object DeltetXt_ORGANIZATIONSList(string HItemID)
        {
@@ -256,7 +254,7 @@
            try
            {
                //删除权限
                //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
                //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;