通讯录权限修改，部门权限修改，用户管理权限修改，地址修改，报表修改，坐席监控权限修改，工单修改

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/AddressBookController.cs

@@ -353,12 +353,13 @@ namespace CallCenterApi.Interface.Controllers
             {
                 int userId = CurrentUser.UserData.F_UserId;
                 Model.T_Sys_UserAccount userModel = new BLL.T_Sys_UserAccount().GetModel(userId);
+                Model.T_Sys_RoleInfo ro = new BLL.T_Sys_RoleInfo().GetModel(userModel.F_RoleId);
                 int dptid = 0;
                 if (userModel != null)
                 {
                         dptid = userModel.F_DeptId;
                 }
-                if (userModel.F_RoleId == 49)
+                if (ro.F_RoleCode == "CLZY" || ro.F_RoleCode == "ZR" || ro.F_RoleCode == "XTGLY")
                 {
                     dptid = 1;
                 }
@@ -390,12 +391,13 @@ namespace CallCenterApi.Interface.Controllers
             {
                 int userId = CurrentUser.UserData.F_UserId;
                 Model.T_Sys_UserAccount userModel = new BLL.T_Sys_UserAccount().GetModel(userId);
+                Model.T_Sys_RoleInfo ro = new BLL.T_Sys_RoleInfo().GetModel(userModel.F_RoleId);
                 int dptid = 0;
                 if (userModel != null)
                 {
                     dptid = userModel.F_DeptId;
                 }
-                if (userModel.F_RoleId == 49)
+                if (ro.F_RoleCode  == "CLZY" || ro.F_RoleCode == "ZR" || ro.F_RoleCode == "XTGLY")
                 {
                     dptid = 1;
                 }

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/DepartmentController.cs

@@ -455,6 +455,10 @@ namespace CallCenterApi.Interface.Controllers
                 {
                     if (ro.F_RoleCode == "CLZY")
                         pId=1;
+                    else if (ro.F_RoleCode == "ZR")
+                        pId = 1;
+                    else if (ro.F_RoleCode == "XTGLY")
+                        pId = 1;
                 }
                 if (pId == 2)
                 {
@@ -463,7 +467,7 @@ namespace CallCenterApi.Interface.Controllers
                 else if (pId == 421)
                 {
                     where = "isnull(F_DeptId,0)='" + 1+ "'and F_State=1";
-                        } 
+                 } 
                 else
                 {
                      where = " isnull(F_DeptId,0)='" + pId + "' and F_State=1 ";

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/UserAccountController.cs

@@ -689,21 +689,34 @@ namespace CallCenterApi.Interface.Controllers
             {
                 int userId = CurrentUser.UserData.F_UserId;
                 Model.T_Sys_UserAccount userModel = new BLL.T_Sys_UserAccount().GetModel(userId);
-
+                int pId = 0;
+                if (userModel != null)
+                    pId = userModel.F_DeptId;
                 if (userModel.F_RoleId == 53)
                 {
                     return Error("无操作权限");
                 }
+              
+                var uModel = new BLL.T_Sys_UserAccount().GetModel(input.Usercode);
                 if (userModel .F_RoleId ==49)
                 {
-                    var uModel = new BLL.T_Sys_UserAccount().GetModel(input.Usercode);
                     if (uModel!=null )
                     {
                         if (userModel.F_UserCode != uModel.F_UserCode&& uModel.F_RoleId ==49)
                             return Error("不能修改其他人员");
                     }
-                  
+                   
+                }
+                if (pId == 2|| pId == 421)
+                {
+                    if (uModel != null)
+                    {
+                        Model.T_Sys_RoleInfo ro = rolebll.GetModel(uModel.F_RoleId);
+                        if (ro.F_RoleCode  != "ZG" && ro.F_RoleCode != "YWY")
+                            return Error("无修改此人员权限");
+                    }
                 }
+               
                 BLL.T_Sys_UserAccount sysUserAccountBll = new BLL.T_Sys_UserAccount();
                 Model.T_Sys_UserAccount userAccountModel = sysUserAccountBll.GetModelList("  F_UserId = " + 
                     input.UserId).FirstOrDefault();
@@ -851,12 +864,27 @@ namespace CallCenterApi.Interface.Controllers
         [Authority]
         public ActionResult DelUsers(string[] ids, int state = 0)
         {
+            int userId = CurrentUser.UserData.F_UserId;
+            Model.T_Sys_UserAccount userModel = new BLL.T_Sys_UserAccount().GetModel(userId);
             if (ids == null || ids.Length <= 0)
                 return Error("请选择用户");
             var idStr = string.Join(",", ids);
             if (string.IsNullOrEmpty(idStr))
                 return Error("请选择用户");
+            int pId = 0;
+            if (userModel != null)
+                pId = userModel.F_DeptId;
+            var uModel = new BLL.T_Sys_UserAccount().GetModel(int.Parse(ids[0]));
 
+            if (pId == 2 || pId == 421)
+            {
+                if (uModel != null)
+                {
+                    Model.T_Sys_RoleInfo ro = rolebll.GetModel(uModel.F_RoleId);
+                    if (ro.F_RoleCode != "ZG" && ro.F_RoleCode != "YWY")
+                        return Error("无删除此人员权限");
+                }
+            }
             SysConfigController sys = new SysConfigController();
             if (state == 0)
             {
@@ -882,11 +910,27 @@ namespace CallCenterApi.Interface.Controllers
         {
             if (Request.IsAuthenticated)
             {
+                int userId = CurrentUser.UserData.F_UserId;
+                Model.T_Sys_UserAccount userModel = new BLL.T_Sys_UserAccount().GetModel(userId);
                 if (ids == null || ids.Length <= 0)
                     return Error("请选择用户");
                 var idStr = string.Join(",", ids);
                 if (string.IsNullOrEmpty(idStr))
                     return Error("请选择用户");
+                int pId = 0;
+                if (userModel != null)
+                    pId = userModel.F_DeptId;
+                var uModel = new BLL.T_Sys_UserAccount().GetModel(int .Parse (ids[0]));
+
+                if (pId == 2 || pId == 421)
+                {
+                    if (uModel != null)
+                    {
+                        Model.T_Sys_RoleInfo ro = rolebll.GetModel(uModel.F_RoleId);
+                        if (ro.F_RoleCode != "ZG" && ro.F_RoleCode != "YWY")
+                            return Error("无删除此人员权限");
+                    }
+                }
                 if (sysUserAccountBll.DeleteList(idStr))
                     return Success("删除成功");
                 else
@@ -912,7 +956,7 @@ namespace CallCenterApi.Interface.Controllers
                     if (roleid != 17)
                     {
                         if (deptid != 0)
-                            sql += " and F_DeptId=" + deptid;
+                            sql += " and F_RoleId=" + 1;
                     }
                 }
 

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

@@ -867,7 +867,7 @@ namespace CallCenterApi.Interface.Controllers.customer
         public ActionResult Import()
         {
             DataTable dt = new DataTable();
-            var depts = new BLL.T_Sys_UserAccount().GetModelList("F_DeptId in (select F_DeptId   FROM T_Sys_Department WHERE F_State=1 and ( F_DeptCode like '|0|1|14|%' )) ");
+            var depts = new BLL.T_Sys_UserAccount().GetModelList("F_DeptId in (select F_DeptId   FROM T_Sys_Department WHERE F_State=1 and ( F_DeptCode like '|0|1|16|%'or F_DeptCode like '|0|1|17|%' )) ");
            
             #region 
             dt.Columns.Add("工号");

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

@@ -172,6 +172,23 @@ namespace CallCenterApi.Interface.Controllers.customer
             }
             return NoToken("未知错误，请重新登录");
         }
+        public ActionResult GetCounty  (string city)
+        {
+            if (Request.IsAuthenticated)
+            {
+                if (string .IsNullOrEmpty (city))
+                    return Success("加载失败");
+                var model = new BLL.T_RegionCategory().GetModelList (" F_DeleteFlag=0 and F_RegionName like'%" + city.Trim() + "%'  and F_ParentId !=0").FirstOrDefault ();
+                if (model!=null )
+                {
+                    DataTable dt = new DataTable();
+                    dt = new BLL.T_RegionCategory().GetList(" F_DeleteFlag=0 and F_ParentId=" + model.F_RegionId ).Tables[0];
+                    return Success("加载成功", dt);
+                }
+                return Success("加载失败");
+            }
+            return NoToken("未知错误，请重新登录");
+        }
         /// <summary>
         /// 获取地市列表
         /// </summary>

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/BusinessController.cs

@@ -632,7 +632,7 @@ namespace CallCenterApi.Interface.Controllers.report
         /// <param name="edate"></param>
         /// <param name="isdc"></param>
         /// <returns></returns>
-        public ActionResult Distribution(DateTime? datetime , int isdc = 0)
+        public ActionResult Distribution(string sttime  ,string endtime, int isdc = 0)
         {
           //  int userId = CurrentUser.UserData.F_UserId;
          //   Model.T_Sys_UserAccount userModel = new BLL.T_Sys_UserAccount().GetModel(userId);
@@ -640,64 +640,91 @@ namespace CallCenterApi.Interface.Controllers.report
             DateTime time=DateTime .Now ;
            
             DataTable dt = new DataTable();
-            if (datetime != null )
+           
+            if (!string .IsNullOrEmpty (endtime))
             {
-                time =DateTime .Parse ( datetime.ToString ());
+                time =DateTime .Parse (endtime);
             }
             Timeslot timeslot = GetTimeslot(time.Month );
             int days = 30;
-            if (time.Month ==1)
-            {
-                days = 31;
-            }
-            else
-            {
-                 days = System.Threading.Thread.CurrentThread.CurrentUICulture.Calendar.GetDaysInMonth(time.Year, time.Month - 1);//获取天数
-            }
             int day = 31;
-            DateTime lastmonth= time.AddMonths(-1);
-            sql += " and F_CreateTime>='" + lastmonth.ToString ("yyyy-MM") +"-28" + " 00:00:00' ";
-            if (time.Month != 12)
-            {
-                sql += " and F_CreateTime<='" + time.ToString("yyyy-MM") + "-27" + " 23:59:59' ";
-                day = 27;
-            }
-            else
-            {
-                sql += " and F_CreateTime<='" + time.ToString("yyyy-MM") + "-31" + " 23:59:59' ";
-            }
-            sql += $" and (F_Type=2 or (F_Duplicate in(2,0)and F_Type=3))";
-            var modelList= new BLL.T_Bus_WorkOrder().GetModelList(sql);
             Product product = new Product();
             product.dates = new List<Date>();
-            int lastday = days - 27;
-            #region 上月28号至最后一天
-          
-            if (time .Month !=1)
-            {
-                for (int i = 0; i < lastday; i++)
+            //时间筛选
+            if (!string.IsNullOrEmpty(sttime))
+            {
+                DateTime stime = DateTime.Parse(sttime);
+                System.TimeSpan ime = time - stime;
+                days = (int )ime.TotalDays+1;
+                sql += " and F_CreateTime>='" + stime.ToString("yyyy-MM-dd") + " 00:00:00' ";
+                sql += " and F_CreateTime<='" + time.ToString("yyyy-MM-dd") + " 23:59:59' ";
+                sql += $" and (F_Type=2 or (F_Duplicate in(2,0)and F_Type=3))";
+                var modelLis = new BLL.T_Bus_WorkOrder().GetModelList(sql);
+                for (int i = 0; i < days; i++)
                 {
-                    string name = string.Format("{0}-{1}", lastmonth.ToString("yyyy-MM"), 28 + i);
-                    product.dates.Add(RetuDate(name, timeslot, modelList));
+                    string name = "";
+                    name = stime.AddDays(i).ToString("yyyy-MM-dd");
+                    product.dates.Add(RetuDate(name, timeslot, modelLis));
                 }
             }
-           
-
-            #endregion
-                #region 本月一号至27号
-            for (int i=0;i < day; i++)
+            else
             {
-                string name = "";
-                if (i <9)
+                //系统时间
+                if (time.Month == 1)
                 {
-                    name=  string.Format("{0}-0{1}", time.ToString("yyyy-MM"), 1 + i);
+                    days = 31;
                 }
                 else
                 {
-                   name = string.Format("{0}-{1}", time.ToString("yyyy-MM"), 1 + i);
+                    days = System.Threading.Thread.CurrentThread.CurrentUICulture.Calendar.GetDaysInMonth(time.Year, time.Month - 1);//获取天数
+                }
+                DateTime lastmonth = time.AddMonths(-1);
+                sql += " and F_CreateTime>='" + lastmonth.ToString("yyyy-MM") + "-28" + " 00:00:00' ";
+                if (time.Month != 12)
+                {
+                    sql += " and F_CreateTime<='" + time.ToString("yyyy-MM") + "-27" + " 23:59:59' ";
+                    day = 27;
+                }
+                else
+                {
+                    sql += " and F_CreateTime<='" + time.ToString("yyyy-MM") + "-31" + " 23:59:59' ";
+                }
+                sql += $" and (F_Type=2 or (F_Duplicate in(2,0)and F_Type=3))";
+                var modelLis = new BLL.T_Bus_WorkOrder().GetModelList(sql);
+               
+                int lastday = days - 27;
+                #region 上月28号至最后一天
+
+                if (time.Month != 1)
+                {
+                    for (int i = 0; i < lastday; i++)
+                    {
+                        string name = string.Format("{0}-{1}", lastmonth.ToString("yyyy-MM"), 28 + i);
+                        product.dates.Add(RetuDate(name, timeslot, modelLis));
+                    }
+                }
+                for (int i = 0; i < day; i++)
+                {
+                    string name = "";
+                    if (i < 9)
+                    {
+                        name = string.Format("{0}-0{1}", time.ToString("yyyy-MM"), 1 + i);
+                    }
+                    else
+                    {
+                        name = string.Format("{0}-{1}", time.ToString("yyyy-MM"), 1 + i);
+                    }
+                    product.dates.Add(RetuDate(name, timeslot, modelLis));
                 }
-                product.dates.Add(RetuDate(name, timeslot, modelList));
             }
+
+
+
+
+
+            #endregion
+            #region 本月一号至27号
+            var modelList = new BLL.T_Bus_WorkOrder().GetModelList(sql);
             Date date = new Date();
             date.total = modelList.Count;
             date.name = "合计";

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/ZuoXiWorkTotalController.cs

@@ -365,11 +365,11 @@ namespace CallCenterApi.Interface.Controllers.report
                         //未评价为0
                        
                         drNew["坐席登录次数"] = izxdlcs.ToString();
-                        float a = idlsc / 360;
-                        float  b=idlsc % 360/60;
+                        float a = idlsc / 3600;
+                        float  b=idlsc % 3600/60;
                     drNew["登录时长分钟数"] = string .Format ("{0}小时{1}分钟",a ,b );
-                    float c = idlsc / 360;
-                    float d = idlsc % 360 / 60;
+                    float c = idlsc / 3600;
+                    float d = idlsc % 3600 / 60;
                     drNew["工作时长分钟数"] = drNew["工作时长分钟数"] = string.Format("{0}小时{1}分钟", c, d); ;
                         drNew["平均每天工作时长"] = Math.Round((double.Parse(iWorktime.ToString()) / 60 / 60 / days), 2).ToString();
                         drNew["平均操作分钟数"] = (ipjczsc / 60).ToString();

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/tel/SeatMonitoringController.cs

@@ -30,7 +30,8 @@ namespace CallCenterApi.Interface.Controllers.tel
                 string sql = "";
                 if (roleid != 17)
                 {
-                    sql = " and F_DeptId=" + deptid;
+                    if (deptid != 0)
+                        sql += " and F_RoleId=" + 1;
                 }
                 if (userModel.F_SeartGroupID!=0)
                 {

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

@@ -186,7 +186,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             sql += "AND F_Duplicate !=5"+ uwhere+ where;
                             sql += "AND F_State in (1)";
                             sql += RetuSql(ro, 0, ua);
-                            if (ro.F_RoleCode == "YWY" || ro.F_RoleCode == "QTJS" || ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBTZX")
+                            if (ro.F_RoleCode == "YWY" || ro.F_RoleCode == "QTJS" || ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBTZX" || ro.F_RoleCode == "ZG")
                             {
                                 DFP = 0;
                                 break;
@@ -199,7 +199,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             sql += "AND F_Duplicate !=5" + uwhere+ where;
                             sql += "AND F_State=3";
                             sql += RetuSql(ro, 0, ua);
-                            if (ro.F_RoleCode == "YWY")
+                            if (ro.F_RoleCode == "YWY" || ro.F_RoleCode == "ZG")
                             {
                                 sql += "AND F_Notifications=" + ua.F_UserCode;
                             }
@@ -216,7 +216,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             sql += "AND F_Duplicate !=5" + uwhere+ where;
                             sql += "AND F_State=4";
                             sql += RetuSql(ro, 0, ua);
-                            if (ro.F_RoleCode == "YWY")
+                            if (ro.F_RoleCode == "YWY" || ro.F_RoleCode == "ZG")
                             {
                                 sql += "AND F_Notifications=" + ua.F_UserCode;
                             }
@@ -233,7 +233,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             sql += "AND F_Duplicate !=5" + uwhere+ where;
                             sql += "AND F_State=5";
                             sql += RetuSql(ro, 0, ua);
-                            if (ro.F_RoleCode == "YWY" || ro.F_RoleCode == "QTJS" || ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBTZX")
+                            if (ro.F_RoleCode == "YWY" || ro.F_RoleCode == "QTJS" || ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBTZX" || ro.F_RoleCode == "ZG")
                             {
                                 THDFP  = 0;
                                 break;
@@ -246,7 +246,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             sql += "AND F_Duplicate !=5"+ where;
                             sql += "AND F_State=6";
                             sql += RetuSql(ro, 0, ua);
-                            if (ro.F_RoleCode == "YWY" || ro.F_RoleCode == "QTJS")
+                            if (ro.F_RoleCode == "YWY" || ro.F_RoleCode == "QTJS" || ro.F_RoleCode == "ZG")
                             {
                                 THDTJ  = 0;
                                 break;
@@ -259,7 +259,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             sql += "AND F_Duplicate !=5" + uwhere+ where;
                             sql += "AND F_State=10";
                             sql += RetuSql(ro, 0, ua);
-                            if (ro.F_RoleCode == "YWY")
+                            if (ro.F_RoleCode == "YWY" || ro.F_RoleCode == "ZG")
                             {
                                 sql += "AND F_Notifications ='" + ua.F_UserCode + "'";
                             }
@@ -283,7 +283,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             sql += $" and (F_DealTimely= '1类问题' or F_DealTimely= 'Ⅰ级' )";
                             sql += $" and F_State !=10";
                             sql += RetuSql(ro, 0, ua);
-                            if (ro.F_RoleCode == "YWY")
+                            if (ro.F_RoleCode == "YWY" || ro.F_RoleCode == "ZG")
                                 sql += "AND F_DealUser=" + ua.F_UserCode;
                             if (ro.F_RoleCode == "QTJS")
                                 sql += "AND F_CreateUser=" + ua.F_UserCode;
@@ -298,7 +298,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             sql += $" and (F_DealTimely= '2类问题' or F_DealTimely= 'Ⅱ级' )";
                             sql += $" and F_State !=10";
                             sql += RetuSql(ro, 0, ua);
-                            if (ro.F_RoleCode == "YWY")
+                            if (ro.F_RoleCode == "YWY" || ro.F_RoleCode == "ZG")
                                 sql += "AND F_DealUser=" + ua.F_UserCode;
                             if (ro.F_RoleCode == "QTJS")
                                 sql += "AND F_CreateUser=" + ua.F_UserCode;
@@ -312,7 +312,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             sql += $" and (F_DealTimely= '3类问题' or F_DealTimely= '普通工单' )";
                             sql += $"and  F_State !=10";
                             sql += RetuSql(ro, 0, ua);
-                            if (ro.F_RoleCode == "YWY")
+                            if (ro.F_RoleCode == "YWY" || ro.F_RoleCode == "ZG")
                                 sql += "AND F_DealUser=" + ua.F_UserCode;
                             if (ro.F_RoleCode == "QTJS")
                                 sql += "AND F_CreateUser=" + ua.F_UserCode;
@@ -323,7 +323,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             sql += $"  F_IsDelete=0" + uwhere+ where;
                             sql += "AND F_Duplicate !=5";
                             sql += "AND F_Duplicate=6";
-                            if (ro.F_RoleCode == "BSCJL" || ro.F_RoleCode == "YWY")
+                            if (ro.F_RoleCode == "BSCJL" || ro.F_RoleCode == "YWY" || ro.F_RoleCode == "ZG")
                             {
                                 sql += "AND F_Notifications ='" + ua.F_UserCode + "'";
                             }
@@ -343,7 +343,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             sql += "AND F_Duplicate !=5" + uwhere ;
                             sql += " and (F_Type=" + 1 + "or ( F_Duplicate in(1)and F_Type!=2 ))";
                             sql += RetuSql(ro, 0, ua);
-                            if (ro.F_RoleCode == "YWY")
+                            if (ro.F_RoleCode == "YWY" || ro.F_RoleCode == "ZG")
                                 sql += "AND F_DealUser=" + ua.F_UserCode;
                             if (ro.F_RoleCode == "QTJS")
                             {
@@ -411,7 +411,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     else
                         return Error("无操作权限");
                 }
-                if (!string.IsNullOrWhiteSpace(dealTimely))//重要级别
+                if (!string.IsNullOrEmpty(dealTimely))//重要级别
                 {
                     if (dealTimely == "3类问题"|| dealTimely == "普通工单")
                         sql += $" and (F_DealTimely= '3类问题' or F_DealTimely= '普通工单' )";
@@ -420,7 +420,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     else if (dealTimely == "1类问题" || dealTimely == "Ⅰ级")
                         sql += $" and (F_DealTimely= '1类问题' or F_DealTimely= 'Ⅰ级' )";
                 }
-                if (!string.IsNullOrWhiteSpace(area)&& !string.IsNullOrWhiteSpace(offce))
+                if (!string.IsNullOrEmpty(area)&& !string.IsNullOrEmpty(offce))
                 {
                     if (area == "0"|| offce == "0")
                     {
@@ -431,7 +431,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         sql += $" and (F_Area in(" + area + ") or  F_Office in(" + offce + "))";
                     }
                 }
-                else if (!string.IsNullOrWhiteSpace(area))//分公司
+                else if (!string.IsNullOrEmpty(area))//分公司
                 {
                     if (area == "0")
                     {
@@ -443,7 +443,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     }
 
                 }
-                else  if (!string.IsNullOrWhiteSpace(offce))//分公司
+                else  if (!string.IsNullOrEmpty(offce))//分公司
                 {
                     if (offce=="0")
                     {
@@ -454,7 +454,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                           sql += $" and F_Office in(" + offce + ")";
                     }
                 }
-                if (!string.IsNullOrWhiteSpace(keywords))//关键字搜索
+                if (!string.IsNullOrEmpty(keywords))//关键字搜索
                 {
                     if (keywords=="咨询")
                     {
@@ -530,13 +530,13 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         case 1://待分派
                             sql += "AND F_State in (1)"+ uwhere;
                             sql += RetuSql(ro, see, ua);
-                            if (ro.F_RoleCode == "YWY" || ro.F_RoleCode == "QTJS" )
+                            if (ro.F_RoleCode == "YWY" || ro.F_RoleCode == "QTJS" || ro.F_RoleCode == "ZG")
                                 return Error("无操作权限");
                             break;
                         case 3://待处理
                             sql += "AND F_State=3"+ uwhere;
                             sql += RetuSql(ro, see, ua);
-                            if (ro.F_RoleCode == "YWY")
+                            if (ro.F_RoleCode == "YWY" || ro.F_RoleCode == "ZG")
                             {
                                 sql += "AND F_Notifications=" + ua.F_UserCode;
                             }
@@ -546,7 +546,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         case 4://处理中
                             sql += "AND F_State=4"+ uwhere;
                             sql += RetuSql(ro, see, ua);
-                            if (ro.F_RoleCode == "YWY")
+                            if (ro.F_RoleCode == "YWY" || ro.F_RoleCode == "ZG")
                             {
                                 sql += "AND F_Notifications ='" + ua.F_UserCode + "'";
                             }
@@ -556,13 +556,13 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         case 5://退回待分派
                             sql += "AND F_State=5"+ uwhere;
                             sql += RetuSql(ro, see, ua);
-                            if (ro.F_RoleCode == "YWY" || ro.F_RoleCode == "QTJS" )
+                            if (ro.F_RoleCode == "YWY" || ro.F_RoleCode == "QTJS" || ro.F_RoleCode == "ZG")
                                 return Error("无操作权限");
                             break;
                         case 6://退回待提交
                             sql += "AND F_State=6";
                             sql += RetuSql(ro, see, ua);
-                            if (ro.F_RoleCode == "YWY" || ro.F_RoleCode == "QTJS")
+                            if (ro.F_RoleCode == "YWY" || ro.F_RoleCode == "QTJS" || ro.F_RoleCode == "ZG")
                                 return Error("无操作权限");
                             break;
                    
@@ -570,7 +570,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             sql += "AND F_State=10"+ uwhere;
                             sql += RetuSql(ro, see, ua);
 
-                            if ( ro.F_RoleCode == "YWY")
+                            if ( ro.F_RoleCode == "YWY" || ro.F_RoleCode == "ZG")
                             {
                                 sql += "AND F_Notifications ='" + ua.F_UserCode + "'";
                             }
@@ -582,7 +582,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         case 11:
                             sql += $" and (F_Type=" + 1 + "or ( F_Duplicate in(1)and F_Type!=2 ))";
                             sql += RetuSql(ro, see, ua);
-                            if (ro.F_RoleCode == "YWY")
+                            if (ro.F_RoleCode == "YWY" || ro.F_RoleCode == "ZG")
                                 sql += "AND F_DealUser=" + ua.F_UserCode;
                             if (ro.F_RoleCode == "QTJS")
                                 return Error("无操作权限");
@@ -978,10 +978,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             {
                 sql += "AND F_Office =" + ua.F_DeptId;
             }
-            else if (ro.F_RoleCode == "ZG")
-            {
-                sql += "AND F_Distribution =" + ua.F_DeptId;
-            }
+          
             return sql;
         }
         /// <summary>

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Input/WorkOrderInput.cs

@@ -327,5 +327,9 @@ namespace CallCenterApi.Interface.Models.Input
         {
             get; set;
         }
+        public DateTime? F_ltemlastTime
+        {
+            get; set;
+        }
     }
 }