Merge branch 'master' of http://192.168.1.222:3000/yuqian/ZYKJ_API

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/callout/CallPlanController.cs

@@ -46,6 +46,26 @@ namespace CallCenterApi.Interface.Controllers.callout
                 sql += "  and (TaskName like '%" + filter.Name.Trim() + "%' ) ";
             }
 
+            //var roleid = CurrentUser.UserData.F_RoleId;
+            //var deptid = CurrentUser.UserData.F_DeptId;
+            //var deptcode = CurrentUser.UserData.F_DeptCode;
+            //var usercode = CurrentUser.UserData.F_UserCode;
+            //if (roleid != 0)
+            //{
+            //    if (roleid != 17)
+            //    {
+            //        if (deptcode.IndexOf("|531|") > 0)
+            //        {
+            //            sql += " and UserCode in (select F_UserCode from T_Sys_UserAccount where F_DeptID in (select F_DeptId from T_Sys_Department where F_DeptCode like '" + deptcode + "%')) ";
+            //        }
+            //        else
+            //        {
+            //            sql += " and UserCode in (select F_UserCode from T_Sys_UserAccount where F_DeptId=" + deptid + ")";
+            //        }
+            //    }
+            //}
+
+
             Model.PageData<Model.T_CTI_Task> pageModel = new Model.PageData<Model.T_CTI_Task>();
             var recordCount = 0;
             var dt = BLL.PagerBLL.GetListPager(
@@ -224,6 +244,7 @@ namespace CallCenterApi.Interface.Controllers.callout
                 model.ConcurrencyType = input.ConcurrencyType;
                 model.Concurrency = input.ConcurrencyType == 0 ? (int)input.Concurrency : input.Concurrency;
                 model.RecordFileId = input.RecordPathId;
+                model.ExInfo = CurrentUser.UserData.F_DeptId.ToString();
                 model.y_HMCount = 0;
                 model.y_HCCount = 0;
                 model.y_YJCount = 0;

CallCenterApi/CallCenterApi.Model/T_CTI_Task.cs

@@ -93,7 +93,7 @@ namespace CallCenterApi.Model
             get { return _calltype; }
         }
         /// <summary>
-        /// 与呼转类型对应，如果是队列，则为队列号；如果是IVR，则是IVR编号；如果是电话，则是电话号。
+        /// 【部门Id】
         /// </summary>
         public string ExInfo
         {