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

wtt

2024-10-04 2f6f2d57f37b1992d1b0d26a21c2257ce9e2b2c9

 WebAPI/Controllers/BLL/Xt_UserController.cs

@@ -1,6 +1,7 @@
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Pub_Class;
using SyntacticSugar.constant;
using System;
using System.Collections;
using System.Collections.Generic;
@@ -107,6 +108,26 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                //获取当前用户身份列表
                string sql = "select HLev from System_UserGroupInfo u " +
                        " left join System_UserGroup r " +
                        "on u.GroupId = r.GroupID where u.UserId = '" + HCzybm + "'";

                //用户身份判断
                DataSet hLev = oCN.RunProcReturn(sql, "System_UserGroupInfo");
                foreach(DataRow dr in hLev.Tables[0].Rows)
                {
                    if (!dr["HLev"].Equals(RoleConstant.EMPLOYEE))
                    {
                        objJsonResult.code = CodeConstant.FAIL;
                        objJsonResult.count = CountConstant.FAIL;
                        objJsonResult.Message = "管理员身份不允许删除！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                }      

                oCN.BeginTran();
                //删除用户信息
                oCN.RunProc("delete from  Gy_Czygl where Czybm='" + HCzybm + "'");
@@ -1552,6 +1573,168 @@
        }
        #endregion

        #region 用户关联部门查询
        /// <summary>
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        [Route("Xt_User/UserRelationDeptlist")]
        [HttpGet]
        public object UserRelationDeptlist(string sWhere, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //查看权限
                if (!DBUtility.ClsPub.Security_Log("Gy_UserRelationDept_Query", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无查看权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                string sql = "";


                if (sWhere == null || sWhere.Equals(""))
                {
                    sql = "select * from h_v_Gy_UserDeptRelationList_Query order by 用户代码 asc,部门代码 asc";
                    ds = oCN.RunProcReturn(sql, "h_v_Gy_UserDeptRelationList_Query");
                }
                else
                {
                    sql = "select * from h_v_Gy_UserDeptRelationList_Query where 1=1 ";
                    sql = sql + sWhere + " order by 用户代码 asc,部门代码 asc";
                    ds = oCN.RunProcReturn(sql, "h_v_Gy_UserDeptRelationList_Query");
                }

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region 用户关联部门 根据用户ID查找
        /// <summary>
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        [Route("Xt_User/UserRelationDeptlist_EditInit")]
        [HttpGet]
        public object UserRelationDeptlist_EditInit(int HItemID, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //查看权限
                if (!DBUtility.ClsPub.Security_Log("Gy_UserRelationDept_Query", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无查看权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                string sql = "select * from h_v_Gy_UserDeptRelationList_Query where HItemID = " + HItemID;
                ds = oCN.RunProcReturn(sql, "h_v_Gy_UserDeptRelationList_Query");

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region 用户关联部门 删除
        /// <summary>
        ///参数：string HInterID。
        ///返回值：object。
        /// </summary>
        [Route("Xt_User/UserRelationDeptlist_Drop")]
        [HttpGet]
        public object UserRelationDeptlist_Drop(string HInterID, string user)
        {
            try
            {
                string s = "";

                //查看权限
                if (!DBUtility.ClsPub.Security_Log("Gy_UserRelationDept_Drop", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无删除权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                if (HInterID == null || HInterID.Equals(""))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "HInterID不能为空！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                oCN.BeginTran();

                string sql = "delete from Gy_UserDeptRelation where HItemID = " + HInterID;
                oCN.RunProc(sql);

                oCN.Commit();

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = null;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region  根据用户编码查找已分配工作中心列表
        [Route("Xt_User/UserWorkCenterlistPlaylist")]
        [HttpGet]