RMYY_CallCenter_Api.Bll/T_Wowo_repairyqbll.cs

@@ -47,8 +47,9 @@ namespace RMYY_CallCenter_Api.Bll
         /// </summary>
         public List<T_Wowo_repairyq> GetListall()
         {
-            DataSet ds = dal.GetListall();
-            return DataTableToList(ds.Tables[0]);
+            //DataSet ds = dal.GetListall();
+            //return DataTableToList(ds.Tables[0]);
+            return dal.GetListall();
         }
         /// <summary>
         /// 分页获取数据列表

RMYY_CallCenter_Api.Bll/T_Wowo_wocodetypebll.cs

@@ -51,7 +51,7 @@ namespace RMYY_CallCenter_Api.Bll
         /// <summary>
         /// 获取院区信息
         /// </summary>
-        public DataSet GetListall()
+        public List<RMYY_CallCenter_Api.Model.T_Wowo_wocodetype> GetListall()
         {
             return dal.GetListall();
         }

RMYY_CallCenter_Api.Dal/T_Sys_UserAccount.cs

@@ -30,16 +30,17 @@ namespace RMYY_CallCenter_Api.Dal
             return DbHelperSQL.Exists(strSql.ToString(), parameters);
         }
 
+
         /// <summary>
-		/// 增加一条数据
-		/// </summary>
-		public int Add(RMYY_CallCenter_Api.Model.T_Sys_UserAccount model)
+        /// 增加一条数据
+        /// </summary>
+        public int Add(RMYY_CallCenter_Api.Model.T_Sys_UserAccount model)
         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("insert into T_Sys_UserAccount(");
-            strSql.Append("F_UserCode,F_Password,F_ExtensionNumber,F_UserName,F_DeptId,F_RoleId,F_Sex,F_Telephone,F_WxOpenId,F_Remark,F_SeatFlag,F_SeatGroup,F_EnableFlag,F_CreateUser,F_CreateTime,F_DeleteFlag,F_DeleteUser,F_DeleteTime)");
+            strSql.Append("F_UserCode,F_Password,F_ExtensionNumber,F_UserName,F_DeptId,F_RoleId,F_Sex,F_Telephone,F_WxOpenId,F_Remark,F_SeatFlag,F_SeatGroup,F_EnableFlag,F_CreateUser,F_CreateTime,F_DeleteFlag,F_DeleteUser,F_DeleteTime,F_See,F_WorkPhone,F_HomeAddress,F_Job)");
             strSql.Append(" values (");
-            strSql.Append("@F_UserCode,@F_Password,@F_ExtensionNumber,@F_UserName,@F_DeptId,@F_RoleId,@F_Sex,@F_Telephone,@F_WxOpenId,@F_Remark,@F_SeatFlag,@F_SeatGroup,@F_EnableFlag,@F_CreateUser,@F_CreateTime,@F_DeleteFlag,@F_DeleteUser,@F_DeleteTime)");
+            strSql.Append("@F_UserCode,@F_Password,@F_ExtensionNumber,@F_UserName,@F_DeptId,@F_RoleId,@F_Sex,@F_Telephone,@F_WxOpenId,@F_Remark,@F_SeatFlag,@F_SeatGroup,@F_EnableFlag,@F_CreateUser,@F_CreateTime,@F_DeleteFlag,@F_DeleteUser,@F_DeleteTime,@F_See,@F_WorkPhone,@F_HomeAddress,@F_Job)");
             strSql.Append(";select @@IDENTITY");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_UserCode", SqlDbType.VarChar,50),
@@ -59,7 +60,11 @@ namespace RMYY_CallCenter_Api.Dal
                     new SqlParameter("@F_CreateTime", SqlDbType.DateTime),
                     new SqlParameter("@F_DeleteFlag", SqlDbType.Int,4),
                     new SqlParameter("@F_DeleteUser", SqlDbType.VarChar,50),
-                    new SqlParameter("@F_DeleteTime", SqlDbType.DateTime)};
+                    new SqlParameter("@F_DeleteTime", SqlDbType.DateTime),
+                    new SqlParameter("@F_See", SqlDbType.NVarChar,500),
+                    new SqlParameter("@F_WorkPhone", SqlDbType.VarChar,50),
+                    new SqlParameter("@F_HomeAddress", SqlDbType.NVarChar,200),
+                    new SqlParameter("@F_Job", SqlDbType.NVarChar,200)};
             parameters[0].Value = model.F_UserCode;
             parameters[1].Value = model.F_Password;
             parameters[2].Value = model.F_ExtensionNumber;
@@ -78,6 +83,10 @@ namespace RMYY_CallCenter_Api.Dal
             parameters[15].Value = model.F_DeleteFlag;
             parameters[16].Value = model.F_DeleteUser;
             parameters[17].Value = model.F_DeleteTime;
+            parameters[18].Value = model.F_See;
+            parameters[19].Value = model.F_WorkPhone;
+            parameters[20].Value = model.F_HomeAddress;
+            parameters[21].Value = model.F_Job;
 
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
             if (obj == null)
@@ -114,9 +123,10 @@ namespace RMYY_CallCenter_Api.Dal
             strSql.Append("F_DeleteFlag=@F_DeleteFlag,");
             strSql.Append("F_DeleteUser=@F_DeleteUser,");
             strSql.Append("F_DeleteTime=@F_DeleteTime,");
-
-            strSql.Append("F_See=@F_See");
-
+            strSql.Append("F_See=@F_See,");
+            strSql.Append("F_WorkPhone=@F_WorkPhone,");
+            strSql.Append("F_HomeAddress=@F_HomeAddress,");
+            strSql.Append("F_Job=@F_Job");
             strSql.Append(" where F_UserId=@F_UserId");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_UserCode", SqlDbType.VarChar,50),
@@ -137,9 +147,10 @@ namespace RMYY_CallCenter_Api.Dal
                     new SqlParameter("@F_DeleteFlag", SqlDbType.Int,4),
                     new SqlParameter("@F_DeleteUser", SqlDbType.VarChar,50),
                     new SqlParameter("@F_DeleteTime", SqlDbType.DateTime),
-
-                      new SqlParameter("@F_See", SqlDbType.NVarChar,200),
-
+                    new SqlParameter("@F_See", SqlDbType.NVarChar,500),
+                    new SqlParameter("@F_WorkPhone", SqlDbType.VarChar,50),
+                    new SqlParameter("@F_HomeAddress", SqlDbType.NVarChar,200),
+                    new SqlParameter("@F_Job", SqlDbType.NVarChar,200),
                     new SqlParameter("@F_UserId", SqlDbType.Int,4)};
             parameters[0].Value = model.F_UserCode;
             parameters[1].Value = model.F_Password;
@@ -160,7 +171,10 @@ namespace RMYY_CallCenter_Api.Dal
             parameters[16].Value = model.F_DeleteUser;
             parameters[17].Value = model.F_DeleteTime;
             parameters[18].Value = model.F_See;
-            parameters[19].Value = model.F_UserId;
+            parameters[19].Value = model.F_WorkPhone;
+            parameters[20].Value = model.F_HomeAddress;
+            parameters[21].Value = model.F_Job;
+            parameters[22].Value = model.F_UserId;
 
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
             if (rows > 0)
@@ -243,7 +257,7 @@ namespace RMYY_CallCenter_Api.Dal
         {
 
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select  top 1 F_UserId,F_UserCode,F_Password,F_ExtensionNumber,F_UserName,F_DeptId,F_RoleId,F_Sex,F_Telephone,F_WxOpenId,F_Remark,F_SeatFlag,F_SeatGroup,F_EnableFlag,F_CreateUser,F_CreateTime,F_DeleteFlag,F_DeleteUser,F_DeleteTime from T_Sys_UserAccount with(nolock) ");
+            strSql.Append("select  top 1 * from T_Sys_UserAccount with(nolock) ");
             strSql.Append(" where F_UserId=@F_UserId");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_UserId", SqlDbType.Int,4)
@@ -269,7 +283,7 @@ namespace RMYY_CallCenter_Api.Dal
         {
 
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select  top 1 F_UserId,F_UserCode,F_Password,F_ExtensionNumber,F_UserName,F_DeptId,F_RoleId,F_Sex,F_Telephone,F_WxOpenId,F_Remark,F_SeatFlag,F_SeatGroup,F_EnableFlag,F_CreateUser,F_CreateTime,F_DeleteFlag,F_DeleteUser,F_DeleteTime from T_Sys_UserAccount with(nolock) ");
+            strSql.Append("select  top 1 *  from T_Sys_UserAccount with(nolock) ");
             strSql.Append(" where F_UserCode=@F_UserCode");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_UserCode", SqlDbType.VarChar,50)
@@ -290,9 +304,9 @@ namespace RMYY_CallCenter_Api.Dal
 
 
         /// <summary>
-		/// 得到一个对象实体
-		/// </summary>
-		public RMYY_CallCenter_Api.Model.T_Sys_UserAccount DataRowToModel(DataRow row)
+        /// 得到一个对象实体
+        /// </summary>
+        public RMYY_CallCenter_Api.Model.T_Sys_UserAccount DataRowToModel(DataRow row)
         {
             RMYY_CallCenter_Api.Model.T_Sys_UserAccount model = new RMYY_CallCenter_Api.Model.T_Sys_UserAccount();
             if (row != null)
@@ -373,18 +387,33 @@ namespace RMYY_CallCenter_Api.Dal
                 {
                     model.F_DeleteTime = DateTime.Parse(row["F_DeleteTime"].ToString());
                 }
+                if (row["F_See"] != null)
+                {
+                    model.F_See = row["F_See"].ToString();
+                }
+                if (row["F_WorkPhone"] != null)
+                {
+                    model.F_WorkPhone = row["F_WorkPhone"].ToString();
+                }
+                if (row["F_HomeAddress"] != null)
+                {
+                    model.F_HomeAddress = row["F_HomeAddress"].ToString();
+                }
+                if (row["F_Job"] != null)
+                {
+                    model.F_Job = row["F_Job"].ToString();
+                }
             }
             return model;
         }
 
-
         /// <summary>
         /// 获得数据列表
         /// </summary>
         public DataSet GetList(string strWhere)
         {
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select F_UserId,F_UserCode,F_Password,F_ExtensionNumber,F_UserName,F_DeptId,F_RoleId,F_Sex,F_Telephone,F_WxOpenId,F_Remark,F_SeatFlag,F_SeatGroup,F_EnableFlag,F_CreateUser,F_CreateTime,F_DeleteFlag,F_DeleteUser,F_DeleteTime");
+            strSql.Append("select *");
             strSql.Append(" FROM T_Sys_UserAccount with(nolock) ");
             if (strWhere.Trim() != "")
             {
@@ -404,7 +433,7 @@ namespace RMYY_CallCenter_Api.Dal
             {
                 strSql.Append(" top " + Top.ToString());
             }
-            strSql.Append(" F_UserId,F_UserCode,F_Password,F_ExtensionNumber,F_UserName,F_DeptId,F_RoleId,F_Sex,F_Telephone,F_WxOpenId,F_Remark,F_SeatFlag,F_SeatGroup,F_EnableFlag,F_CreateUser,F_CreateTime,F_DeleteFlag,F_DeleteUser,F_DeleteTime ");
+            strSql.Append(" * ");
             strSql.Append(" FROM T_Sys_UserAccount with(nolock) ");
             if (strWhere.Trim() != "")
             {

RMYY_CallCenter_Api.Dal/T_Wowo_repairyqdal.cs

@@ -96,11 +96,12 @@ namespace RMYY_CallCenter_Api.Dal
         /// <summary>
         /// 获取院区信息
         /// </summary>
-        public DataSet GetListall()
+        public List<RMYY_CallCenter_Api.Model.T_Wowo_repairyq> GetListall()
         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("SELECT * FROM  T_Wowo_repairyq ");
-            return DbHelperSQL.Query(strSql.ToString());
+            DataSet ds= DbHelperSQL.Query(strSql.ToString());
+            return DataTableToList(ds.Tables[0]);
         }
         /// <summary>
         /// 分页获取
@@ -157,6 +158,26 @@ namespace RMYY_CallCenter_Api.Dal
                 return null;
             }
         }
+
+        public List<RMYY_CallCenter_Api.Model.T_Wowo_repairyq> DataTableToList(DataTable dt)
+        {
+            List<RMYY_CallCenter_Api.Model.T_Wowo_repairyq> modelList = new List<RMYY_CallCenter_Api.Model.T_Wowo_repairyq>();
+            int rowsCount = dt.Rows.Count;
+            if (rowsCount > 0)
+            {
+                RMYY_CallCenter_Api.Model.T_Wowo_repairyq model;
+                for (int n = 0; n < rowsCount; n++)
+                {
+                    model = DataRowToModel(dt.Rows[n]);
+                    if (model != null)
+                    {
+                        modelList.Add(model);
+                    }
+                }
+            }
+            return modelList;
+        }
+
         /// <summary>
         /// 得到一个对象实体
         /// </summary>

RMYY_CallCenter_Api.Dal/T_Wowo_wocodetypedal.cs

@@ -93,11 +93,12 @@ namespace RMYY_CallCenter_Api.Dal
         /// <summary>
         /// 获取院区信息
         /// </summary>
-        public DataSet GetListall()
+        public List<RMYY_CallCenter_Api.Model.T_Wowo_wocodetype> GetListall()
         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("SELECT * FROM  T_Wowo_wocodetype ");
-            return DbHelperSQL.Query(strSql.ToString());
+            DataSet ds = DbHelperSQL.Query(strSql.ToString());
+            return DataTableToList(ds.Tables[0]);
         }
         /// <summary>
         /// 分页获取
@@ -154,6 +155,27 @@ namespace RMYY_CallCenter_Api.Dal
                 return null;
             }
         }
+
+
+        public List<RMYY_CallCenter_Api.Model.T_Wowo_wocodetype> DataTableToList(DataTable dt)
+        {
+            List<RMYY_CallCenter_Api.Model.T_Wowo_wocodetype> modelList = new List<RMYY_CallCenter_Api.Model.T_Wowo_wocodetype>();
+            int rowsCount = dt.Rows.Count;
+            if (rowsCount > 0)
+            {
+                RMYY_CallCenter_Api.Model.T_Wowo_wocodetype model;
+                for (int n = 0; n < rowsCount; n++)
+                {
+                    model = DataRowToModel(dt.Rows[n]);
+                    if (model != null)
+                    {
+                        modelList.Add(model);
+                    }
+                }
+            }
+            return modelList;
+        }
+
         /// <summary>
         /// 得到一个对象实体
         /// </summary>

RMYY_CallCenter_Api.Model/T_Sys_UserAccount.cs

@@ -38,6 +38,9 @@ namespace RMYY_CallCenter_Api.Model
         private string f_zXZCode;
 
         private string _f_see;
+        private string _f_workphone;
+        private string _f_homeaddress;
+        private string _f_job;
         /// <summary>
         /// 主键
         /// </summary>
@@ -200,24 +203,51 @@ namespace RMYY_CallCenter_Api.Model
         /// </summary>
         public string F_DeptCode { get; set; }
 
-            public string F_DeptName//部门名称 F_ZXZCode
-            {
-                set { f_deptName = value; }
-                get { return f_deptName; }
-            }
-            public string F_ZXZCode  
-            {
-                set { f_zXZCode = value; }
-                get { return f_zXZCode; }
-            }//坐席组编码
+        public string F_DeptName//部门名称 F_ZXZCode
+        {
+            set { f_deptName = value; }
+            get { return f_deptName; }
+        }
+        public string F_ZXZCode
+        {
+            set { f_zXZCode = value; }
+            get { return f_zXZCode; }
+        }//坐席组编码
 
-        public string F_See {
+        public string F_See
+        {
             set { _f_see = value; }
             get { return _f_see; }
         }
-            #endregion Model
 
-     }
+        /// <summary>
+        /// 单位电话
+        /// </summary>
+        public string F_WorkPhone
+        {
+            set { _f_workphone = value; }
+            get { return _f_workphone; }
+        }
+        /// <summary>
+        /// 家庭住址
+        /// </summary>
+        public string F_HomeAddress
+        {
+            set { _f_homeaddress = value; }
+            get { return _f_homeaddress; }
+        }
+        /// <summary>
+        /// 职务
+        /// </summary>
+        public string F_Job
+        {
+            set { _f_job = value; }
+            get { return _f_job; }
+        }
+
+        #endregion Model
+
+    }
 }
  
 

RMYY_CallCenter_Api.Utility/Tree/TreeModel.cs

@@ -42,7 +42,7 @@ namespace RMYY_CallCenter_Api.Utility
             get { return _text; }
         }
         /// <summary>
-        /// 工单级别类型
+        /// 工单级别类型  (部门类型  1 院区  2 部门)
         /// </summary>
         public int? TypeId { get; set; }
         private List<TreeModel> _children;

RMYY_CallCenter_Api/Controllers/System/CustomerController.cs

@@ -123,7 +123,6 @@ namespace RMYY_CallCenter_Api.Controllers.System
                 model.F_CreatedOn = DateTime.Now;   //创建时间
                 model.F_DeleteFlag = 0;             //删除标志
                 model.F_Remark = remark;
-
                 model.F_AboutLinkMan = linkman;
                 int n = bll.Add(model);
                 if (n > 0)

RMYY_CallCenter_Api/Controllers/System/DepartmentController.cs

@@ -11,6 +11,7 @@ namespace RMYY_CallCenter_Api.Controllers.System
     public class DepartmentController : BaseController
     {
         private Bll.T_Sys_Department departmentBLL = new Bll.T_Sys_Department();
+        private Bll.T_Wowo_repairyqbll yqBll = new Bll.T_Wowo_repairyqbll();
 
         // GET: Department
         /// <summary>
@@ -61,45 +62,60 @@ namespace RMYY_CallCenter_Api.Controllers.System
         /// </summary>
         /// <returns></returns>
         [HttpGet]
-        public ActionResult GetTreeList()
+        public ActionResult GetTreeList(int hosid=0,int pid=0)
         {
+            var hoslist = yqBll.GetListall();
             var dptmodel = departmentBLL.GetModelList(" F_State=1");
             dptmodel.Sort((x, y) => x.F_Sort ?? 0 - y.F_Sort ?? 0);//排序
             var treeList = new List<TreeModel>();
-            foreach (var item in dptmodel.Where(p =>p.F_ParentId == 0).ToList())
+            if (hoslist.Count > 0)
             {
-                TreeModel treeModel = new TreeModel();
-                treeModel.id = item.F_DeptId.ToString();
-                treeModel.IconCls = "";
-                treeModel.text = item.F_DeptName;
-                treeModel.parentid = item.F_ParentId.ToString();
-                treeModel.children = TreeRecursion(dptmodel, item.F_DeptId.ToString());
-                treeList.Add(treeModel);
+                foreach (var hositem in hoslist)
+                {
+                    TreeModel treeModel = new TreeModel();
+                    treeModel.id = hositem.T_Woid.ToString();
+                    treeModel.IconCls = "";
+                    treeModel.text = hositem.T_Woname;
+                    treeModel.parentid = "-1";
+                    treeModel.TypeId = 1;
+                    treeModel.children = TreeRecursion(dptmodel, "0", hositem.T_Woid);
+                    treeList.Add(treeModel);
+                    //var dptlist = dptmodel.Where(p => p.F_ParentId == 0 && p.T_Woid == hositem.T_Woid).ToList();
+                }
             }
             //return Content(treeList.ToJson());
             return Success("获取菜单树成功", treeList);
         }
 
-        private List<TreeModel> TreeRecursion(List<Model.T_Sys_Department> data, string parentId = "0")
+        private List<TreeModel> TreeRecursion(List<Model.T_Sys_Department> data, string parentId = "0", int hosid = 0)
         {
+            List<Model.T_Sys_Department> item = null;
             List<TreeModel> newList = new List<TreeModel>();
-            if (parentId != "0")
+            //if (parentId != "0")
+            //{
+            if (hosid != 0)
+            {
+                item = data.FindAll(t => t.F_ParentId.ToString() == parentId && t.T_Woid == hosid);//data建议在调用此扩展方法前已经排序过
+            }
+            else
+            {
+                item = data.FindAll(t => t.F_ParentId.ToString() == parentId);//data建议在调用此扩展方法前已经排序过
+            }
+            if (item.Count > 0)
             {
-                List<Model.T_Sys_Department> item = data.FindAll(t => t.F_ParentId.ToString() == parentId);//data建议在调用此扩展方法前已经排序过
-                if (item.Count > 0)
+                foreach (Model.T_Sys_Department entity in item)
                 {
-                    foreach (Model.T_Sys_Department entity in item)
-                    {
-                        TreeModel treeModel = new TreeModel();
-                        treeModel.id = entity.F_DeptId.ToString();
-                        treeModel.IconCls = "";
-                        treeModel.text = entity.F_DeptName;
-                        treeModel.parentid = entity.F_ParentId.ToString();
-                        treeModel.children = TreeRecursion(item, entity.F_DeptId.ToString());
-                        newList.Add(treeModel);
-                    }
+                    TreeModel treeModel = new TreeModel();
+                    treeModel.id = entity.F_DeptId.ToString();
+                    treeModel.IconCls = "";
+                    treeModel.text = entity.F_DeptName;
+                    treeModel.parentid = entity.F_ParentId.ToString();
+                    treeModel.TypeId = 2;
+                    treeModel.children = TreeRecursion(item, entity.F_DeptId.ToString());
+                    newList.Add(treeModel);
                 }
             }
+            //}
             return newList;
         }
 

RMYY_CallCenter_Api/Controllers/System/RoleController.cs

@@ -43,6 +43,7 @@ namespace RMYY_CallCenter_Api.Controllers.System
                                     out recordCount);
             var obj = new
             {
+                state = "success",
                 rows = dt,
                 total = recordCount
             };

RMYY_CallCenter_Api/Controllers/System/SeatGroupController.cs

@@ -38,6 +38,7 @@ namespace RMYY_CallCenter_Api.Controllers.System
 
             var obj = new
             {
+                state = "success",
                 rows = dt,
                 total = recordCount
             };

RMYY_CallCenter_Api/Controllers/System/UserAccountController.cs

@@ -51,6 +51,7 @@ namespace RMYY_CallCenter_Api.Controllers.System
                                     out recordCount);
             var obj = new
             {
+                state = "success",
                 rows = dt,
                 total = recordCount
             };
@@ -102,7 +103,7 @@ namespace RMYY_CallCenter_Api.Controllers.System
 
         // [Authority]
         //修改用户信息
-        public ActionResult EditUsers(int userid, string Usercode, string Username, string Password, int DeptId, int RoleId, int IsSeat, int? SeatGroup, string Remark, string Phon, string sex, string Extno = "")
+        public ActionResult EditUsers(int userid, string Usercode, string Username, string Password, int DeptId, int RoleId, int IsSeat, int? SeatGroup, string Remark, string Phon, string sex, string companyphone, string address, string job, string Extno = "")
         {
             var umodel = userbll.GetModelList("  F_UserId = " + userid).FirstOrDefault();
             if (umodel == null)
@@ -117,13 +118,19 @@ namespace RMYY_CallCenter_Api.Controllers.System
             umodel.F_ExtensionNumber = Extno.Trim();
             umodel.F_DeptId = DeptId;
             umodel.F_RoleId = RoleId;
-            umodel.F_SeatFlag = IsSeat;
             umodel.F_SeatGroup = SeatGroup;
+            if (SeatGroup > 0)
+            {
+                umodel.F_SeatFlag = 1;
+            }
+            else
+                umodel.F_SeatFlag = 0;
             umodel.F_Remark = Remark;
             umodel.F_Telephone = Phon;
             umodel.F_Sex = sex;
-            umodel.F_CreateUser = User.F_UserCode;
-            umodel.F_DeleteFlag = 0;
+            umodel.F_WorkPhone = companyphone;
+            umodel.F_HomeAddress = address;
+            umodel.F_Job = job;
             if (userbll.Update(umodel))
                 return Success("编辑成功！");
             else
@@ -132,7 +139,7 @@ namespace RMYY_CallCenter_Api.Controllers.System
 
         //[Authority]
         //添加用户信息
-        public ActionResult AddUsers(string Usercode, string Username, string Password, int DeptId, int RoleId, int IsSeat, int? SeatGroup, string Remark, string Phon, string sex,string Extno = "")
+        public ActionResult AddUsers(string Usercode, string Username, string Password, int DeptId, int RoleId,int? SeatGroup, string Remark, string Phon, string sex, string companyphone,string address,string job, string Extno = "")
         {
             if (userbll.GetRecordCount(" F_UserCode='" + Usercode.Trim() + "' ") > 0)
             {
@@ -147,13 +154,21 @@ namespace RMYY_CallCenter_Api.Controllers.System
             ua.F_ExtensionNumber = Extno.Trim();
             ua.F_DeptId = DeptId;
             ua.F_RoleId = RoleId;
-            ua.F_SeatFlag = IsSeat;
             ua.F_SeatGroup = SeatGroup;
+            if (SeatGroup > 0)
+            {
+                ua.F_SeatFlag = 1;
+            }
+            else
+                ua.F_SeatFlag = 0;
             ua.F_Remark = Remark;
             ua.F_Telephone = Phon;
             ua.F_Sex = sex;
             ua.F_CreateUser = User.F_UserCode;
             ua.F_CreateTime = DateTime.Now;
+            ua.F_WorkPhone = companyphone;
+            ua.F_HomeAddress = address;
+            ua.F_Job = job;
             ua.F_DeleteFlag = 0;
             if (new Bll.T_Sys_UserAccount().Add(ua) > 0)
                 return Success("新增成功！");

RMYY_CallCenter_Api/Controllers/WorkOrder/T_Hos_WorkOrderController.cs

@@ -101,19 +101,19 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
                     }
                     //else
                     //{
-                    transql = GetTranPersonsql(User.F_UserCode,1, state);
-                        if (transql != "")
-                        {
-                            wokerlist = transql.Split(',').Distinct().ToList();
-                        }
-                        if (wokerlist.Count > 0)
-                        {
-                            sql += $" and F_Id in (" + string.Join(",", wokerlist) + ")";
-                        }
-                        else
-                        {
-                            sql += $" and F_Id in (0)";
-                        }
+                    transql = GetTranPersonsql(User.F_UserCode, 1, state);
+                    if (transql != "")
+                    {
+                        wokerlist = transql.Split(',').Distinct().ToList();
+                    }
+                    if (wokerlist.Count > 0)
+                    {
+                        sql += $" and F_Id in (" + string.Join(",", wokerlist) + ")";
+                    }
+                    else
+                    {
+                        sql += $" and F_Id in (0)";
+                    }
                     //}
                 }
                 if (User.F_DeptCode == "WYZX" && User.F_RoleCode == "ZYY")//维运转运人判断
@@ -165,7 +165,7 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
 
                         if (User.F_RoleCode == "ZYY")
                         {
-                            int? wostate= itembll.GetModelList("F_WoID=" + item.F_Id + " and (F_CreateUser=" + User.F_UserCode + " or F_NextUser like '%" + User.F_UserCode + "%')").OrderByDescending(pp => pp.F_ID).FirstOrDefault().F_WoState;
+                            int? wostate= itembll.GetModelList("F_WoID=" + item.F_Id + " and (F_CreateUser=" + User.F_UserCode + " or F_NextUser like '%" + User.F_UserCode + "%')").OrderByDescending(pp => pp.F_ID).FirstOrDefault()?.F_WoState??0;
                             item.F_Wostate = EnumHelper.GetDescription((EnumHosWorkOrderState)wostate);
                             item.F_State = wostate;
                         }

RMYY_CallCenter_Api/Controllers/WorkOrderBaseController.cs

@@ -7,6 +7,7 @@ using System.IO;
 using System.Linq;
 using System.Web;
 using System.Web.Mvc;
+using System.Reflection;
 
 namespace RMYY_CallCenter_Api.Controllers
 {
@@ -340,6 +341,20 @@ namespace RMYY_CallCenter_Api.Controllers
         }
 
 
+        public object  CreateInstance()
+        {
+
+            //用传递参数来得到一个类的实例
 
+            string itemType = "T_Sys_GongDan";
+            string assembleyName = this.GetType().Assembly.GetName().Name;//Net.BLL
+            string nameSpace = this.GetType().Namespace;
+
+            Type type = Type.GetType($"RMYY_CallCenter_Api.Bll.{itemType},RMYY_CallCenter_Api.Bll");
+            //用Activator .CreateInstance创建函数实例,默认的不带参数的构造函数
+            object obj = (object)Activator.CreateInstance(type, null);
+            return obj;      
+        }
+            
     }
 }