bug修改

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/customer/CustomerNewController.cs

@@ -220,6 +220,63 @@ namespace CallCenterApi.Interface.Controllers.customer
             string time = times.ToString("yyMMddhhmm");
             return time;
         }
+        public ActionResult CallAdd(CustomerBaseNewInput input)
+        {
+            string usercode = CurrentUser.UserData.F_UserCode;
+            if (string.IsNullOrEmpty(input.F_LegalPhone))
+                return Error("请输入客户电话");
+            var sql = $" and  F_LegalPhone ='" + input.F_LegalPhone.Trim() + "'";
+            var userModel = new BLL.T_Cus_CustomerBaseNew().GetModelList(" F_IsDelete = 0 " + sql);
+            if (userModel.Count() > 0)
+            {
+            var model = cusbll.GetModel(userModel[0].F_CustomerId);
+                #region 保存客户基本信息
+           model = inputtoobj(model, input);
+            #endregion
+            bool n = cusbll.Update(model);
+            if (n)
+            {
+                return Success("保存成功！");
+            }
+            else
+                return Error("保存失败！");
+            }
+            else
+            {
+                int i = 0;
+                if (string.IsNullOrEmpty(input.F_CustomerCode))
+                {
+                    while (true)
+                    {
+                        if (!getunique(0, GetIntCode(i)))
+                        {
+                            input.F_CustomerCode = GetIntCode(i);
+                            break;
+                        }
+                        else
+                        {
+                            i++;
+                        }
+                    }
+                }
+                var model = new Model.T_Cus_CustomerBaseNew();
+                #region 保存客户基本信息
+                model = inputtoobj(model, input);
+                model.F_CreateBy = usercode;
+                model.F_CreateOn = DateTime.Now;
+                model.F_IsDelete = 0;
+                #endregion
+                int n = cusbll.Add(model);
+                if (n > 0)
+                {
+                    return Success("新增成功！");
+                }
+                else
+                    return Error("新增失败！");
+
+            }
+
+        }
         /// <summary>
         /// 添加客户信息
         /// </summary>
@@ -668,11 +725,11 @@ namespace CallCenterApi.Interface.Controllers.customer
                                 }
                                 else
                                 {
-                                    msg = msg + "第" + headrow + "行，物料编号重复，未导入<br>";
+                                    msg = msg + "第" + headrow + "行，客户编号重复，未导入<br>";
                                 }
                             }
                             else
-                                msg = msg + "第" + headrow + "行，物料编号为空或格式不正确，未导入<br>";
+                                msg = msg + "第" + headrow + "行，客户编号为空或格式不正确，未导入<br>";
                             #endregion
                         }
                         if (string.IsNullOrEmpty(msg))

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/customer/RegionCategoryController.cs

@@ -288,7 +288,10 @@ namespace CallCenterApi.Interface.Controllers.customer
                     string currentID = categorylist[i].F_RegionId.ToString();//当前功能ID
                     model.id = currentID;
                     model.IconCls = "";//图标
-                    model.headerid =int .Parse ( categorylist[i].F_Layer.ToString ());
+                    if (categorylist[i].F_Layer != null)
+                    {
+                        model.headerid = int.Parse(categorylist[i].F_Layer.ToString());
+                    }
                     model.text = categorylist[i].F_RegionName;
                     tab2 = new BLL.T_RegionCategory().GetList("F_ParentId=" + currentID + " and F_DeleteFlag=0 order by f_sort").Tables[0];
                     if (tab2 != null && tab2.Rows.Count > 0)

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/weixin/WxLoginController.cs

@@ -545,9 +545,9 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 if (!string.IsNullOrWhiteSpace(code))//工单编号
                     sql += $" and F_WorkOrderCode like '%" + code.Trim() + "%'";
                 if (!string.IsNullOrWhiteSpace(keywords))//关键字搜索
-                    sql += $"  and  F_QuestionType like '%" + keywords.Trim()
+                    sql += $"  and  (F_QuestionType like '%" + keywords.Trim()
                          + "%' or F_ZX_Area like '%" + keywords.Trim() + "%' or F_ZX_Branch like '%" + keywords.Trim()
-                         + "%' or F_CusName like '%" + keywords.Trim() + "%'or F_CusPhone like '%" + keywords.Trim() + "%'  ";
+                         + "%' or F_CusName like '%" + keywords.Trim() + "%'or F_CusPhone like '%" + keywords.Trim() + "%' ) ";
                 if (!string.IsNullOrWhiteSpace(cusname))//客户姓名
                     sql += $" and F_CusName like '%" + cusname.Trim() + "%'";
                 if (!string.IsNullOrWhiteSpace(cusphone))//客户电话
@@ -622,9 +622,12 @@ namespace CallCenterApi.Interface.Controllers.weixin
                             }
                             break;
                         case 2://待完成的(待接单)
-                            if (GetDJDWorkOrderID(ua.F_UserCode) != "")
+                            if (GetDeptWorkOrderID(ua.F_DeptId, ua.F_UserCode) != "")
                             {
-                                sql += $" and F_State=" + (int)EnumWorkOrderState.assign + $"  and T_Wo_WorkOrder.F_ID in ( " + GetDJDWorkOrderID(ua.F_UserCode) + ") "; ;
+
+                                sql += $" and F_State in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.reassign + "," + (int)EnumWorkOrderState.receive + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.abreback + "," + (int)EnumWorkOrderState.assign + ")  and T_Wo_WorkOrder.F_ID in ( " +
+                           GetDeptWorkOrderID(ua.F_DeptId, ua.F_UserCode) + ") "; ;
+
                             }
                             else
                             {
@@ -757,11 +760,11 @@ namespace CallCenterApi.Interface.Controllers.weixin
                             break;
                         case 9://待接单
 
-                            if (GetDeptWorkOrderID(ua.F_DeptId) != "")
+                            if (GetDeptWorkOrderID(ua.F_DeptId,ua .F_UserCode ) != "")
                             {
 
                                 sql += $" and F_State in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.reassign + "," + (int)EnumWorkOrderState.receive + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.abreback + "," + (int)EnumWorkOrderState.assign + ")  and T_Wo_WorkOrder.F_ID in ( " +
-                           GetDeptWorkOrderID(ua.F_DeptId) + ") "; ;
+                           GetDeptWorkOrderID(ua.F_DeptId, ua.F_UserCode) + ") "; ;
 
                             }
                             else
@@ -842,9 +845,9 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 if (!string.IsNullOrWhiteSpace(code))//工单编号
                     sql += $" and F_WorkOrderCode like '%" + code.Trim() + "%'";
                 if (!string.IsNullOrWhiteSpace(keywords))//关键字搜索
-                    sql += $"  and  F_QuestionType like '%" + keywords.Trim()
+                    sql += $"  and ( F_QuestionType like '%" + keywords.Trim()
                          + "%' or F_ZX_Area like '%" + keywords.Trim() + "%' or F_ZX_Branch like '%" + keywords.Trim()
-                         + "%' or F_CusName like '%" + keywords.Trim() + "%'or F_CusPhone like '%" + keywords.Trim() + "%'  ";
+                         + "%' or F_CusName like '%" + keywords.Trim() + "%'or F_CusPhone like '%" + keywords.Trim() + "%')  ";
                 if (!string.IsNullOrWhiteSpace(cusname))//客户姓名
                     sql += $" and F_CusName like '%" + cusname.Trim() + "%'";
                 if (!string.IsNullOrWhiteSpace(cusphone))//客户电话
@@ -983,23 +986,6 @@ namespace CallCenterApi.Interface.Controllers.weixin
             }
         }
         /// <summary>
-        /// 获取部门待完成的工单编号（包括待接单）
-        /// </summary>
-        /// <returns></returns>
-        public string GetDeptWorkOrderID(int deptid)
-        {
-            string str = string.Empty;
-
-            str = "select F_WoID from T_Wo_WorkOrderItem_New where F_ItemType=" + (int)EnumItemType.deal
-                + " and ("
-                    + "(F_WoState in(" + (int)EnumWorkOrderState.assign + "," + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.receive + ") and F_NextDept =" + deptid + ") "//办理中和接单状态的操作人
-                    + " or (F_WoState in(" + (int)EnumWorkOrderState.assign + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.abreback + ") and F_NextDept =" + deptid + ")"//退回下一步操作人
-                + ")"
-                + " and isnull(F_IsUsed,'0')='0' ";
-
-            return str;
-        }
-        /// <summary>
         /// 根据部门获取工单号
         /// </summary>
         /// <returns></returns>
@@ -1053,7 +1039,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
             str = "select F_WoID from T_Wo_WorkOrderItem_New where F_ItemType=" + (int)EnumItemType.deal
                 + " and ("
                     + "(F_WoState in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.receive + ") and F_CreateUser='" + user + "') "//办理中和接单状态的操作人
-                    + " or (F_WoState in(" + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.abreback + ") and F_NextUser='" + user + "')"//退回下一步操作人
+                    + " or (F_WoState in(" + (int)EnumWorkOrderState.reback + ") and F_NextUser='" + user + "')"//退回下一步操作人
                 + ")"
                 + " and isnull(F_IsUsed,'0')='0' ";
 
@@ -1066,36 +1052,45 @@ namespace CallCenterApi.Interface.Controllers.weixin
             return str;
         }
         /// <summary>
-        /// 获取待接单的工单编号
+        /// 获取部门待完成的工单编号
         /// </summary>
         /// <returns></returns>
-        public string GetDJDWorkOrderID(string user)
+        public string GetDeptWorkOrderID(int deptid, string user)
         {
             string str = string.Empty;
-
-            var itemlast = itembll.GetModelList(" isnull(F_IsUsed,'0')='0' and F_ItemType=" + (int)EnumItemType.deal + " and  F_WoState=" + (int)EnumWorkOrderState.assign + " ");
-            //   str = "select F_WoID from T_Wo_WorkOrderItem_New where F_ItemType=" + (int)EnumItemType.deal
-            //    + " and F_WoState=" + (int)EnumWorkOrderState.assign
-            //    + " and isnull(F_IsUsed,'0')='0' and F_NextUser='" + user + "' ";
-            foreach (var it in itemlast)
+            string deptuser = string.Empty;
+            var dept = userAccountBLL .GetModelList("F_DeptId=" + deptid);
+            if (dept != null)
             {
-
-                string[] code = it.F_NextUser.Split(',');
-                for (int i = 0; i < code.Length; i++)
+                foreach (var it in dept)
                 {
-                    if (code[i] == user)
+                    if (it.F_UserCode != user)
                     {
-                        if (str != string.Empty)
-                        {
-                            str = str + "," + it.F_WoID;
-                        }
+                        if (deptuser != "")
+                            deptuser += "','" + it.F_UserCode;
                         else
-                        {
-                            str = it.F_WoID + "";
-                        }
+                            deptuser += it.F_UserCode;
                     }
                 }
             }
+            if (!string.IsNullOrEmpty(deptuser))
+            {
+                // string deptuser = "select F_WoID from T_Sys_UserAccount where F_DeptId=" + deptid;
+                str = "select F_WoID from T_Wo_WorkOrderItem_New where F_ItemType=" + (int)EnumItemType.deal
+                    + " and isnull(F_IsUsed,'0')='0' " + " and "
+                        + "(F_WoState in(" + (int)EnumWorkOrderState.assign + "," + (int)EnumWorkOrderState.abreback + "," + (int)EnumWorkOrderState.reback + ") and F_NextDept =" + deptid + ") "//办理中和接单状态的操作人
+                        + " or (F_WoState =" + (int)EnumWorkOrderState.receive + " and F_NextUser in('" + deptuser + "'))";//退回下一步操作人
+
+
+            }
+            else
+            {
+                str = "select F_WoID from T_Wo_WorkOrderItem_New where F_ItemType=" + (int)EnumItemType.deal
+                   + " and "
+                       + "F_WoState in(" + (int)EnumWorkOrderState.assign + ") and F_NextDept =" + deptid + " "//办理中和接单状态的操作人
+                        + " and isnull(F_IsUsed,'0')='0' ";
+            }
+
             return str;
         }
         /// <summary>
@@ -2768,7 +2763,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 touser = users;
             }
             string htouser = "", htousername = "";
-            if (isApprovalp != 0 && deptid == 37)
+            if (isApprovalp != 0 && nowUser .F_DeptId == 37)
             {
                 if (hclid != 0)
                 {
@@ -2777,8 +2772,8 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     {
                         if (string.IsNullOrEmpty(htouser))
                         {
-                            htouser = htouser + "," + clus.F_UserCode;
-                            htousername = htousername + "," + clus.F_UserName + "(" + clus.F_UserCode + ")";
+                            htouser =  clus.F_UserCode;
+                            htousername =  clus.F_UserName + "(" + clus.F_UserCode + ")";
                         }
                     }
                 }
@@ -2787,8 +2782,16 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     var list = userAccountBLL.GetModelList(" F_DeptId='" + hclbm + "'");
                     foreach (var l in list)
                     {
-                        htouser = htouser + "," + l.F_UserCode;
-                        htousername = htousername + "," + l.F_UserName + "(" + l.F_UserCode + ")";
+                        if (string.IsNullOrEmpty(htouser))
+                        {
+                            htouser = l.F_UserCode;
+                            htousername = l.F_UserName + "(" + l.F_UserCode + ")";
+                        }
+                        else
+                        {
+                            htouser = htouser + "," + l.F_UserCode;
+                            htousername = htousername + "," + l.F_UserName + "(" + l.F_UserCode + ")";
+                        }
                     }
                 }
                 AddLog(model.F_ID, (int)EnumWorkOrderState.assign, "审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, htouser, hclbm, nowUser, overtime, sms, creat);
@@ -2887,7 +2890,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 if (!string.IsNullOrWhiteSpace(code))//工单编号
                     sql += $" and F_WorkOrderCode like '%" + code.Trim() + "%'";
                 if (!string.IsNullOrWhiteSpace(keywords))//关键字搜索
-                    sql += $"  and F_WorkOrderCode like '%" + keywords.Trim() + "%' or F_CusName like '%" + keywords.Trim() + "%'or F_CusPhone like '%" + keywords.Trim() + "%'  ";
+                    sql += $"  and (F_WorkOrderCode like '%" + keywords.Trim() + "%' or F_CusName like '%" + keywords.Trim() + "%'or F_CusPhone like '%" + keywords.Trim() + "%'  )";
                 if (!string.IsNullOrWhiteSpace(cusname))//客户姓名
                     sql += $" and F_CusName like '%" + cusname.Trim() + "%'";
                 if (!string.IsNullOrWhiteSpace(cusphone))//客户电话
@@ -3090,7 +3093,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                         Model.T_Wo_WorkOrder model = woBLL .GetModel(orderid);
                         if (model != null)
                         {
-                        if (model.F_State != 1)
+                        if (model.F_State == 2)
                         {
                             return Error("工单已接单无需重新接单");
                         }
@@ -3482,11 +3485,22 @@ namespace CallCenterApi.Interface.Controllers.weixin
             #endregion
             var content = deptname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + opt + "工单，退回说明：" + cont;
             //获取上一级处理人员
-            var touser = "";
+            var touser = ""; var deptid = 0;
             var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID='" + model.F_ID + "' and F_NextUser='" + nowUser.F_UserCode + "' order by F_CreateTime desc").FirstOrDefault();
             if (itemlast != null)
+            {
+
                 touser = itemlast.F_CreateUser;
-            var itemid = AddLog((int)model.F_ID, wostate, content, (int)EnumItemType.deal, optbut, touser, 0, nowUser, model .F_limit , sms);
+                if (!string.IsNullOrEmpty(touser))
+                {
+                    var ua = userAccountBLL .GetModel(touser);
+                    if (ua != null)
+                    {
+                        deptid = ua.F_DeptId;
+                    }
+                }
+            }
+            var itemid = AddLog((int)model.F_ID, wostate, content, (int)EnumItemType.deal, optbut, touser, deptid, nowUser, model .F_limit , sms);
             if (itemid > 0)
             {
                 #region 处理工单

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/MaterialManageController.cs

@@ -137,7 +137,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             {
                 while (true)
                 {
-                    if (!valcode(GetIntCode()))
+                    if (!getunique(0, GetIntCode()))
                     {
                         input.F_MaterialCode = GetIntCode();
                         break;
@@ -312,29 +312,36 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         
                         if (dr["物料编码"].ToString() != "" && valcode(dr["物料编码"].ToString()))
                         {
-                            Model.T_Wo_MaterialManage dModel = new Model.T_Wo_MaterialManage();
-                            dModel.F_MaterialCode = dr["物料编码"].ToString();//物料编码
-                            dModel.F_MaterialName = dr["物料名称"].ToString();//物料名称
-                            dModel.F_Model = dr["型号"].ToString();//型号
-                            dModel.F_Specs = dr["规格"].ToString();//规格
-                            dModel.F_Level1 = dr["一级分类"].ToString();//一级分类
-                            dModel.F_Level2 = dr["二级分类"].ToString();//二级分类
-                            dModel.F_Level3 = dr["三级分类"].ToString();//三级分类
-                            dModel.F_Brand = dr["品牌"].ToString();//品牌
-                            dModel.F_MaterialEffect = dr["复合肥肥效"].ToString();//复合肥肥效
-                            dModel.F_Pipeline = dr["产品线"].ToString();//产品线
-                            dModel.F_Craft = dr["工艺"].ToString();//工艺
-                            dModel.F_CreateBy = userscode;
-                            dModel.F_CreateOn = DateTime.Now;
-                            dModel.F_IsDelete = 0;
-                            var res = mmBLL.Add(dModel);
-                            if(res>0)
+                            if (!getunique(0, dr["物料编码"].ToString()))
                             {
-                                addoptlog(userscode, ip, EnumOpt.import.ToString(), res.ToString(), "导入成功,导入的文件为："+ newpath+",当前为第"+ headrow + "行");
+                                Model.T_Wo_MaterialManage dModel = new Model.T_Wo_MaterialManage();
+                                dModel.F_MaterialCode = dr["物料编码"].ToString();//物料编码
+                                dModel.F_MaterialName = dr["物料名称"].ToString();//物料名称
+                                dModel.F_Model = dr["型号"].ToString();//型号
+                                dModel.F_Specs = dr["规格"].ToString();//规格
+                                dModel.F_Level1 = dr["一级分类"].ToString();//一级分类
+                                dModel.F_Level2 = dr["二级分类"].ToString();//二级分类
+                                dModel.F_Level3 = dr["三级分类"].ToString();//三级分类
+                                dModel.F_Brand = dr["品牌"].ToString();//品牌
+                                dModel.F_MaterialEffect = dr["复合肥肥效"].ToString();//复合肥肥效
+                                dModel.F_Pipeline = dr["产品线"].ToString();//产品线
+                                dModel.F_Craft = dr["工艺"].ToString();//工艺
+                                dModel.F_CreateBy = userscode;
+                                dModel.F_CreateOn = DateTime.Now;
+                                dModel.F_IsDelete = 0;
+                                var res = mmBLL.Add(dModel);
+                                if (res > 0)
+                                {
+                                    addoptlog(userscode, ip, EnumOpt.import.ToString(), res.ToString(), "导入成功,导入的文件为：" + newpath + ",当前为第" + headrow + "行");
+                                }
+                                else
+                                {
+                                    msg = msg + "第" + headrow + "行，导入失败<br>";
+                                }
                             }
                             else
                             {
-                                msg = msg + "第" + headrow + "行，导入失败<br>";
+                                msg = msg + "第" + headrow + "行，物料编码重复，未导入<br>";
                             }
                         }
                         else
@@ -350,8 +357,20 @@ namespace CallCenterApi.Interface.Controllers.workorder
             }
             return Error("文件不能为空");
         }
+        /// <summary>
+        /// 验证客户编号是否唯一
+        /// </summary>
+        private bool getunique(int id, string code)
+        {
+            var sql = " F_IsDelete=0 ";
+            sql += "and (F_MaterialCode='" + code + "')";
+            if (id > 0)
+                sql += " and F_Id<>" + id;
+            var count = mmBLL.GetModelList(sql).Count();
+
+            return count > 0;
+        }
 
-        
         #region 上传附件
         public DataTable GetFileData(string ids, string prefix)
         {

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderNewController.cs

@@ -52,7 +52,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 if (!string.IsNullOrWhiteSpace(touser))//参与人
                     sql += $" and F_DealBy like '%" + touser.Trim() + "%'";
                 if (!string.IsNullOrWhiteSpace(keywords))//关键字搜索
-                    sql += $"  and  F_CusName like '%" + keywords.Trim() + "%'or F_CusPhone like '%" + keywords.Trim() + "%'  ";
+                    sql += $"  and ( F_CusName like '%" + keywords.Trim() + "%'or F_CusPhone like '%" + keywords.Trim() + "%' ) ";
                 if (!string.IsNullOrWhiteSpace(code))//工单编号
                     sql += $" and F_WorkOrderCode like '%" + code.Trim() + "%'";
                 if (!string.IsNullOrWhiteSpace(cusname))//客户姓名
@@ -139,11 +139,11 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         break;
                     case 1://待接单的
                      
-                             if (GetDeptWorkOrderID(ua.F_DeptId) != "")
+                             if (GetDeptWorkOrderID(ua.F_DeptId,ua .F_UserCode  ) != "")
                         {
                           
                                 sql += $" and F_State in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.reassign + "," + (int)EnumWorkOrderState.receive + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.abreback + "," + (int)EnumWorkOrderState.assign + ")  and T_Wo_WorkOrder.F_ID in ( " +
-                           GetDeptWorkOrderID(ua.F_DeptId) + ") "; ;
+                           GetDeptWorkOrderID(ua.F_DeptId, ua.F_UserCode) + ") "; ;
                             
                         }
                         else 
@@ -423,6 +423,431 @@ namespace CallCenterApi.Interface.Controllers.workorder
 
         }
         /// <summary>
+        /// 获取工单数量
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult GetWorkCount()
+        {
+
+            int userId = CurrentUser.UserData.F_UserId;
+            if (userId != 0)
+            {
+               
+                DataTable dt = new DataTable();
+                #region 筛选条件
+                Model.T_Sys_UserAccount ua = sysUserAccountBll.GetModel(userId);
+                Model.T_Sys_RoleInfo ro = rolebll.GetModel(ua.F_RoleId);
+                string uwhere = " ";
+                string sql = "";
+              int  Assign=0, Receipt = 0, Acceptedorders = 0, Ovar = 0, Allocated = 0, Tobevisited = 0, Returnvisit = 0, Tobefinished = 0, GCApproved = 0, CustomerWorkorder = 0, Delays =
+                    0, DeWorkOrder = 0, Approved = 0, WeChatWorkOrder = 0  , TobeApproved = 0, Createdbill = 0, Backid = 0;
+                for (int i=0;i<=18;i ++)
+                {
+                    switch (i )
+                    {
+                        case 0://待指派的
+                            sql = "";
+                            sql += $"  F_IsDelete=0";
+                            if (ro.F_RoleCode == "GC")
+                            {
+                                sql += " and (F_CreateBy= '" + ua.F_UserCode + "' or T_Wo_WorkOrder.F_ID in ( " + GetCYWorkOrderID(ua.F_UserCode) + ")) ";
+                            }
+                            else if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBZZX" || ro.F_RoleCode == "XTGLY")
+                            {
+                                uwhere = "";
+                            }
+                           
+                            #region 获取部门工单列表
+                            else if (ro.F_RoleCode == "DQJL" || ro.F_RoleCode == "FGSJL" || ro.F_RoleCode == "ZG")
+                            {
+                                string detpid = "";
+                                var deparmentlist = new List<Model.T_Sys_Department>();
+                                Model.T_Sys_Department dModel = departmentBLL.GetModel(ua.F_DeptId);
+                                if (dModel != null)
+                                {
+                                    if (dModel.F_Layer == 1)
+                                    {
+                                        deparmentlist = new BLL.T_Sys_Department().GetModelList(" F_State=1 and F_Layer=" + 2 + " and F_ParentId=" + dModel.F_DeptId);
+                                        if (deparmentlist.Count > 0)
+                                        {
+                                            foreach (var it in deparmentlist)
+                                            {
+                                                if (detpid != "")
+                                                {
+                                                    detpid += "," + it.F_DeptId;
+                                                }
+                                                else
+                                                {
+                                                    detpid = "" + it.F_DeptId; ;
+                                                }
+                                            }
+                                        }
+                                    }
+                                    else
+                                    {
+                                        detpid = ua.F_DeptId.ToString();
+                                    }
+                                    if (GetDeptWorkOrderID(detpid, "" + (int)EnumWorkOrderState.neworder + "," + (int)EnumWorkOrderState.reassign + "") != "")
+                                    {
+                                        sql += $"  and T_Wo_WorkOrder.F_ID in ( " + GetDeptWorkOrderID(detpid, "" + (int)EnumWorkOrderState.neworder + "," + (int)EnumWorkOrderState.reassign + "") + ") "; ;
+                                    }
+                                    else
+                                    {
+                                        Assign = 0;
+                                        break;
+                                    }
+
+                                }
+                                else
+                                {
+                                    Assign = 0;
+                                    break;
+                                }
+                            }
+                            #endregion
+                            else
+                            {
+                                sql += $" and F_CreateBy like '%" + ua.F_UserCode + "%'"; ;
+                            }
+                            sql += $" and F_State in(" + (int)EnumWorkOrderState.neworder + "," + (int)EnumWorkOrderState.reassign + ")" + " " + uwhere;
+                             Assign = new BLL.T_Wo_WorkOrder().GetModelList(sql).Count ;//指派
+                            break;
+                        case 1://待接单的
+                            sql = "";
+                            sql += $"  F_IsDelete=0";
+                            if (GetDeptWorkOrderID(ua.F_DeptId, ua.F_UserCode) != "")
+                            {
+
+                                sql += $" and F_State in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.reassign + "," + (int)EnumWorkOrderState.receive + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.abreback + "," + (int)EnumWorkOrderState.assign + ")  and T_Wo_WorkOrder.F_ID in ( " +
+                           GetDeptWorkOrderID(ua.F_DeptId, ua.F_UserCode) + ") "; ;
+
+                            }
+                            else
+                            {
+
+                                Receipt = 0;
+                                break;
+                            }
+                             Receipt = new BLL.T_Wo_WorkOrder().GetModelList(sql).Count;//接单
+                            break;
+                        case 2://待完成的(待处理)
+                            sql = "";
+                            sql += $"  F_IsDelete=0";
+                            if (GetDWCWorkOrderID(ua.F_UserCode) != null)
+                            {
+                                sql += " and F_State in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.reassign + "," + (int)EnumWorkOrderState.receive + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.abreback + ") and T_Wo_WorkOrder.F_ID in ( " + GetDWCWorkOrderID(ua.F_UserCode) + ") ";
+                            }
+                            else
+                            {
+                                Acceptedorders = 0;
+                                break;
+                            }
+                             Acceptedorders = new BLL.T_Wo_WorkOrder().GetModelList(sql).Count;//已接单
+                        
+                            break;
+                        case 10://已完成的
+                            sql = "";
+                            sql += $"  F_IsDelete=0";
+                            sql += " and F_State =" + (int)EnumWorkOrderState.finish + " and F_DealBy = '" + ua.F_UserCode + "' ";
+                             Ovar = new BLL.T_Wo_WorkOrder().GetModelList(sql).Count;//已完成的
+                          
+                            break;
+                        case 3://客服已分配
+                            sql = "";
+                            sql += $"  F_IsDelete=0";
+                            if (GetParticipateID(ua.F_UserCode) != "")
+                            {
+                                sql += " and  T_Wo_WorkOrder.F_ID in ( " + GetParticipateID(ua.F_UserCode) + ") ";
+                            }
+                            else
+                            {
+                                Allocated = 0;
+                                break;
+                            }
+                             Allocated = new BLL.T_Wo_WorkOrder().GetModelList(sql).Count;//客服已分配
+                       
+                            break;
+                        case 4://待回访
+                            sql = "";
+                            sql += $"  F_IsDelete=0";
+                            if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBZZX" || ro.F_RoleCode == "XTGLY")
+                            {
+                                uwhere = "";
+                            }
+                            else
+                            {
+                                Tobevisited = 0;
+                                break;
+                            }
+                            sql += $" and F_State=" + (int)EnumWorkOrderState.finish + " and F_IsVisit = '" + "1" + "' " + uwhere; ;
+                             Tobevisited = new BLL.T_Wo_WorkOrder().GetModelList(sql).Count;//待回访
+                      
+                            break;
+                        case 6://已回访
+                            sql = "";
+                            sql += $"  F_IsDelete=0";
+                            if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBZZX" || ro.F_RoleCode == "XTGLY")
+                            {
+                                sql += " and (F_CreateBy= '" + ua.F_UserCode + "' or T_Wo_WorkOrder.F_ID in ( " + GetCYWorkOrderID(ua.F_UserCode) + ") or F_State =13)";
+                                sql += $" and F_State=" + (int)EnumWorkOrderState.evaluate; ;
+                            }
+                            else if (ro.F_RoleCode == "DQJL" || ro.F_RoleCode == "FGSJL" || ro.F_RoleCode == "ZG")
+                            {
+                                string detpid = "";
+                                var deparmentlist = new List<Model.T_Sys_Department>();
+                                Model.T_Sys_Department dModel = departmentBLL.GetModel(ua.F_DeptId);
+                                if (dModel != null)
+                                {
+                                    if (dModel.F_Layer == 1)
+                                    {
+                                        deparmentlist = new BLL.T_Sys_Department().GetModelList(" F_State=1 and F_Layer=" + 2 + " and F_ParentId=" + dModel.F_DeptId);
+                                        if (deparmentlist.Count > 0)
+                                        {
+                                            foreach (var it in deparmentlist)
+                                            {
+                                                if (detpid != "")
+                                                {
+                                                    detpid += "," + it.F_DeptId;
+                                                }
+                                                else
+                                                {
+                                                    detpid = "" + it.F_DeptId; ;
+                                                }
+                                            }
+                                        }
+                                    }
+                                    else
+                                    {
+                                        detpid = ua.F_DeptId.ToString();
+                                    }
+                                    if (GetDeptWorkOrderID(detpid, "" + (int)EnumWorkOrderState.evaluate + "") != "")
+                                    {
+                                        sql += $"  and T_Wo_WorkOrder.F_ID in ( " + GetDeptWorkOrderID(detpid, "" + (int)EnumWorkOrderState.evaluate + "") + ") "; ;
+                                    }
+                                    else
+                                    {
+
+                                        Returnvisit = 0;
+                                        break;
+                                    }
+
+                                }
+                                else
+                                {
+                                    Returnvisit = 0;
+                                    break;
+                                }
+                            }
+                            else
+                            {
+                                Returnvisit = 0;
+                                break;
+                            }
+                            sql += $" and F_State=" + (int)EnumWorkOrderState.evaluate;
+                             Returnvisit= new BLL.T_Wo_WorkOrder().GetModelList(sql).Count;//已回访
+                          
+                            break;
+                        case 7://待完结
+                            sql = "";
+                            sql += $"  F_IsDelete=0";
+                            if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBZZX" || ro.F_RoleCode == "XTGLY")
+                            {
+                                uwhere = ""; ;
+                            }
+                            else
+                            {
+                                Tobefinished = 0;
+                                break; ;
+                            }
+                            sql += $" and F_State=" + (int)EnumWorkOrderState.finish + " and F_IsVisit = '" + "0" + "' "; ;
+                             Tobefinished = new BLL.T_Wo_WorkOrder().GetModelList(sql).Count;//待完结
+                            break;
+                        case 8://待审批
+                            sql = "";
+                            sql += $"  F_IsDelete=0";
+                            if (ro.F_RoleCode == "GC")
+                            {
+                                if (GetHApproval(ua.F_UserCode) != "")
+                                {
+                                    sql += $"  and T_Wo_WorkOrder.F_ID in ( " + GetHApproval(ua.F_UserCode) + ") "; ;
+                                }
+                            }
+                            else
+                            {
+
+                                GCApproved = 0;
+                                break; ;
+                            }
+                             GCApproved = new BLL.T_Wo_WorkOrder().GetModelList(sql).Count;//高层待审批
+                            break;
+                        case 9://客户工单
+                            sql = "";
+                            sql += $"  F_IsDelete=0";
+                            if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBZZX" || ro.F_RoleCode == "XTGLY")
+                            {
+                                uwhere = "";
+                            }
+                            else
+                            {
+                                CustomerWorkorder = 0;
+                                break; ;
+                            }
+                            sql += $" and F_State=" + (int)EnumWorkOrderState.customers;
+                             CustomerWorkorder = new BLL.T_Wo_WorkOrder().GetModelList(sql).Count;//客户工单
+
+                            break;
+                        case 11://延期工单
+                            sql = "";
+                            sql += $"  F_IsDelete=0";
+                            if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBZZX" || ro.F_RoleCode == "XTGLY")
+                            {
+                                sql += $" and F_ID in(" + GetDelay() + ")";
+                            }
+                            else
+                            {
+                                Delays = 0;
+                                break; ;
+                            }
+                             Delays = new BLL.T_Wo_WorkOrder().GetModelList(sql).Count;//客户工单
+                          
+                            break;
+                        case 12://微信未通过工单
+                            sql = "";
+                            sql += $"  F_IsDelete=0";
+                            if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBZZX" || ro.F_RoleCode == "XTGLY")
+                            {
+                                sql += $" and F_ID in(" + GetDelay() + ")";
+                            }
+                            else
+                            {
+                                DeWorkOrder = 0;
+                                break; ;
+                            }
+                            sql += $" and F_State=" + (int)EnumWorkOrderState.recustomers;
+                             DeWorkOrder = new BLL.T_Wo_WorkOrder().GetModelList(sql).Count;//微信未通过工单
+                         
+                            break;
+                        case 13://已审批
+                            sql = "";
+                            sql += $"  F_IsDelete=0";
+                            if (ro.F_RoleCode == "DQJL" || ro.F_RoleCode == "FGSJL" || ro.F_RoleCode == "GC")
+                            {
+                                if (GetApprovedOrderID(ua.F_UserCode) != "")
+                                {
+                                    sql += $"  and F_ID in ( " + GetApprovedOrderID(ua.F_UserCode) + ") "; ;
+                                }
+                                else
+                                {
+                                    Approved = 0;
+                                    break; ;
+                                }
+                            }
+                            else
+                            {
+                                Approved = 0;
+                                break; ;
+                            }
+                             Approved = new BLL.T_Wo_WorkOrder().GetModelList(sql).Count;//已审批
+                           
+                            break;
+                        case 14://业务员工单
+                            sql = "";
+                            sql += $"  F_IsDelete=0";
+                            if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBZZX" || ro.F_RoleCode == "XTGLY")
+                            {
+                                sql += $" and F_Source=" + 2;
+                            }
+                            else
+                            {
+                                WeChatWorkOrder = 0;
+                                break; ;
+                            }
+                             WeChatWorkOrder = new BLL.T_Wo_WorkOrder().GetModelList(sql).Count;//微信业务员工单
+                           
+                            break;
+                        case 15://待审批
+                            sql = "";
+                            sql += $"  F_IsDelete=0";
+                            if (ro.F_RoleCode == "DQJL" || ro.F_RoleCode == "FGSJL")
+                            {
+                                if (GetApprovalOrderID(ua, ro.F_RoleCode) != "")
+                                {
+                                    sql += " and  T_Wo_WorkOrder.F_ID in ( " + GetApprovalOrderID(ua, ro.F_RoleCode) + ") ";
+                                }
+                                else
+                                {
+                                    TobeApproved = 0;
+                                    break; ;
+                                }
+                            }
+                            else
+                            {
+                                TobeApproved = 0;
+                                break; ;
+                            }
+
+                             TobeApproved = new BLL.T_Wo_WorkOrder().GetModelList(sql).Count;//待审批
+
+                      
+                            break;
+                        case 16://已创单
+                            sql = "";
+                            sql += $"  F_IsDelete=0";
+                            sql += $" and F_CreateBy  ='" + ua.F_UserCode + "'";
+                             Createdbill = new BLL.T_Wo_WorkOrder().GetModelList(sql).Count;//业务员已创单
+
+                           
+                            break;
+                        case 17://退单
+                            sql = "";
+                            sql += $"  F_IsDelete=0";
+                            if (GetBackid(ua) != "")
+                            {
+                                sql += " and  T_Wo_WorkOrder.F_ID in ( " + GetBackid(ua) + ") ";
+                            }
+                            else
+                            {
+                                Backid = 0;
+                                break; ;
+                            }
+                             Backid = new BLL.T_Wo_WorkOrder().GetModelList(sql).Count;//退单
+                            break;
+                    }
+                }
+
+                #endregion
+              
+                var obj = new
+                {
+                    state = "success",
+                    message = "成功",
+                    Assign = Assign,//指派
+                    Receipt = Receipt,//待接单
+                    Acceptedorders = Acceptedorders,//已接单（待处理）
+                    Ovar = Ovar,//已完成的
+                    Allocated = Allocated,//客服已分配
+                    Tobevisited = Tobevisited,//待回访
+                    Returnvisit = Returnvisit,//已回访
+                    Tobefinished = Tobefinished,//待完结
+                    GCApproved = GCApproved,//高层待审批
+                    CustomerWorkorder = CustomerWorkorder,//客户工单
+                    Delays = Delays,//延期工单
+                    DeWorkOrder = DeWorkOrder,//微信未通过工单
+                    Approved = Approved,//已审批
+                    WeChatWorkOrder = WeChatWorkOrder,//微信业务员工单
+                    TobeApproved = TobeApproved,//待审批
+                    Createdbill = Createdbill,//业务员已创单
+                    Backid = Backid,//待审批
+                };
+                return Content(obj.ToJson()); ;
+            }
+            else
+            {
+                return Error("无操作权限！");
+            }
+
+        }
+        /// <summary>
         ///退回工单列表
         /// </summary>
         public string GetBackid(Model.T_Sys_UserAccount ua)
@@ -1385,25 +1810,50 @@ namespace CallCenterApi.Interface.Controllers.workorder
         public string GetParticipateID(string user)
         {
             string str = string.Empty;
-            str = "select F_WoID from T_Wo_WorkOrderItem_New where F_CreateUser in(" + user + ") and F_OptType in( 1 )";
+            str = "select F_WoID from T_Wo_WorkOrderItem_New where F_CreateUser in(" + user + ") and F_OptType in( 1,7)";
 
             ;
             return str;
         }
         /// <summary>
-        /// 获取部门待完成的工单编号
+        /// 获取部门待接单的工单编号
         /// </summary>
         /// <returns></returns>
-        public string GetDeptWorkOrderID(int  deptid)
+        public string GetDeptWorkOrderID(int  deptid,string user)
         {
             string str = string.Empty;
+            string deptuser= string.Empty;
+            var dept = sysUserAccountBll.GetModelList("F_DeptId="+ deptid);
+            if (dept != null)
+            {
+                foreach (var it in dept)
+                {
+                    if (it.F_UserCode!= user)
+                    {
+                        if (deptuser != "")
+                            deptuser += "','" + it.F_UserCode;
+                        else
+                            deptuser += it.F_UserCode;
+                    }
+                }
+            }
+            if (!string .IsNullOrEmpty (deptuser))
+            {
+                // string deptuser = "select F_WoID from T_Sys_UserAccount where F_DeptId=" + deptid;
+                str = "select F_WoID from T_Wo_WorkOrderItem_New where F_ItemType=" + (int)EnumItemType.deal
+                    + " and isnull(F_IsUsed,'0')='0' " + " and "
+                        + "(F_WoState in(" + (int)EnumWorkOrderState.assign + "," + (int)EnumWorkOrderState.abreback + "," + (int)EnumWorkOrderState.reback + ") and F_NextDept =" + deptid + ") "//办理中和接单状态的操作人
+                        + " or (F_WoState =" + (int)EnumWorkOrderState.receive + " and F_NextUser in('" + deptuser + "'))";//退回下一步操作人
+                   
 
-            str = "select F_WoID from T_Wo_WorkOrderItem_New where F_ItemType=" + (int)EnumItemType.deal
-                + " and ("
-                    + "(F_WoState in(" + (int)EnumWorkOrderState.assign + ","+(int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.receive + ") and F_NextDept =" + deptid + ") "//办理中和接单状态的操作人
-                    + " or (F_WoState in(" + (int)EnumWorkOrderState.assign + ","+(int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.abreback + ") and F_NextDept =" + deptid + ")"//退回下一步操作人
-                + ")"
-                + " and isnull(F_IsUsed,'0')='0' ";
+            }
+            else
+            {
+                str = "select F_WoID from T_Wo_WorkOrderItem_New where F_ItemType=" + (int)EnumItemType.deal
+                   + " and "
+                       + "F_WoState in(" + (int)EnumWorkOrderState.assign + ") and F_NextDept =" + deptid + " "//办理中和接单状态的操作人
+                        + " and isnull(F_IsUsed,'0')='0' ";
+            }
 
             return str;
         }
@@ -1418,7 +1868,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             str = "select F_WoID from T_Wo_WorkOrderItem_New where F_ItemType=" + (int)EnumItemType.deal
                 + " and ("
                     + "(F_WoState in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.receive + ") and F_CreateUser='" + user + "') "//办理中和接单状态的操作人
-                    + " or (F_WoState in(" + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.abreback + ") and F_NextUser='" + user + "')"//退回下一步操作人
+                    + " or (F_WoState in(" + (int)EnumWorkOrderState.reback +") and F_NextUser='" + user + "')"//退回下一步操作人
                 + ")"
                 + " and isnull(F_IsUsed,'0')='0' ";
 
@@ -1462,7 +1912,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
             }
             string str = string.Empty;
             str = "select F_WoID from T_Wo_WorkOrderItem_New where "
-                + " and  "
                      + "F_CreateUser in(" + ua + ") and F_IsUsed=0"
                ;
 
@@ -1611,9 +2060,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 if (!string.IsNullOrWhiteSpace(code))//工单编号
                     sql += $" and F_WorkOrderCode like '%" + code.Trim() + "%'";
                 if (!string.IsNullOrWhiteSpace(keywords))//关键字搜索
-                    sql += $"  and  F_QuestionType like '%" + keywords.Trim()
+                    sql += $"  and  (F_QuestionType like '%" + keywords.Trim()
                          + "%' or F_ZX_Area like '%" + keywords.Trim() + "%' or F_ZX_Branch like '%" + keywords.Trim() 
-                         + "%' or F_CusName like '%" + keywords.Trim() + "%'or F_CusPhone like '%" + keywords.Trim() + "%'  ";
+                         + "%' or F_CusName like '%" + keywords.Trim() + "%'or F_CusPhone like '%" + keywords.Trim() + "%')  ";
                 if (!string.IsNullOrWhiteSpace(cusname))//客户姓名
                     sql += $" and F_CusName like '%" + cusname.Trim() + "%'";
                 if (!string.IsNullOrWhiteSpace(cusphone))//客户电话
@@ -1775,7 +2224,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 if (!string.IsNullOrWhiteSpace(code))//工单编号
                     sql += $" and F_WorkOrderCode like '%" + code.Trim() + "%'";
                 if (!string.IsNullOrWhiteSpace(keywords))//关键字搜索
-                    sql += $"  and  F_CusName like '%" + keywords.Trim() + "%'or F_CusPhone like '%" + keywords.Trim() + "%'  ";
+                    sql += $"  and ( F_CusName like '%" + keywords.Trim() + "%'or F_CusPhone like '%" + keywords.Trim() + "%' ) ";
                 if (!string.IsNullOrWhiteSpace(cusname))//客户姓名
                     sql += $" and F_CusName like '%" + cusname.Trim() + "%'";
                 if (!string.IsNullOrWhiteSpace(cusphone))//客户电话
@@ -3454,7 +3903,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     {
                         while (true)
                         {
-                            if (!getunique(0, GetIntCode()))
+                            if (!gematerque(0, GetIntCode()))
                             {
                                 input.F_MaterialID = GetIntCode();
                                 break;
@@ -3986,7 +4435,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     Model.T_Wo_WorkOrder model = workOrder.GetModel(orderid);
                     if (model != null)
                     {
-                        if(model .F_State !=1)
+                        if(model .F_State ==2)
                         {
                             return Error("工单已接单无需重新接单");
                         }
@@ -4482,11 +4931,23 @@ namespace CallCenterApi.Interface.Controllers.workorder
             #endregion
             var content = deptname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + opt + "工单，退回说明：" + cont;
             //获取上一级处理人员
-            var touser = "";
+            var touser = ""; var deptid=0;
             var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID='" + model.F_ID  + "' and F_NextUser='" + nowUser.F_UserCode + "' order by F_CreateTime desc").FirstOrDefault();
             if (itemlast != null)
+            {
                 touser = itemlast.F_CreateUser;
-            var itemid = AddLog((int)model.F_ID , wostate, content, (int)EnumItemType.deal, optbut, touser, 0, nowUser, model .F_limit ,sms );
+               if (!string .IsNullOrEmpty (touser))
+                {
+                    var ua = sysUserAccountBll .GetModel(touser);
+                    if (ua !=null )
+                    {
+                        deptid = ua.F_DeptId;
+                    }
+                }
+            }
+                
+
+            var itemid = AddLog((int)model.F_ID , wostate, content, (int)EnumItemType.deal, optbut, touser, deptid, nowUser, model .F_limit ,sms );
             if (itemid > 0)
             {
                 #region 处理工单
@@ -4921,29 +5382,39 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 }
                 touser = users;
             }
-            if (isApprovalp != 0&& deptid == 37)
+            string htouser = "", htousername = "";
+            if (isApprovalp != 0 && nowUser.F_DeptId == 37)
             {
                 if (hclid != 0)
                 {
                     Model.T_Sys_UserAccount clus = sysUserAccountBll .GetModel(hclid);
                     if (clus != null)
                     {
-                        if (string.IsNullOrEmpty(touser))
+                        if (string.IsNullOrEmpty(htouser))
                         {
-                            touser = touser + "," + clus.F_UserCode;
-                            tousername = tousername + "," + clus.F_UserName + "(" + clus.F_UserCode + ")";
+                            htouser = clus.F_UserCode;
+                            htousername = clus.F_UserName + "(" + clus.F_UserCode + ")";
                         }
                     }
                 }
                 else
                 {
-                    var list = sysUserAccountBll .GetModelList(" F_DeptId='" + hclbm + "'");
+                    var list = sysUserAccountBll.GetModelList(" F_DeptId='" + hclbm + "'");
                     foreach (var l in list)
                     {
-                        touser = touser + "," + l.F_UserCode;
-                        tousername = tousername + "," + l.F_UserName + "(" + l.F_UserCode + ")";
+                        if (string.IsNullOrEmpty(htouser))
+                        {
+                            htouser = l.F_UserCode;
+                            htousername = l.F_UserName + "(" + l.F_UserCode + ")";
+                        }
+                        else
+                        {
+                            htouser = htouser + "," + l.F_UserCode;
+                            htousername = htousername + "," + l.F_UserName + "(" + l.F_UserCode + ")";
+                        }
                     }
                 }
+                AddLog(model.F_ID, (int)EnumWorkOrderState.assign, "审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, htouser, hclbm, nowUser, overtime, sms, creat);
             }
             #endregion
             #region 工单处理