2.1.2

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

@@ -11,7 +11,7 @@ using System.Web.Mvc;
 
 namespace CallCenterApi.Interface.Controllers
 {
-    [Authority]
+   [Authority]
     public class DepartmentController : BaseController
     {
         private BLL.T_Sys_Department departmentBLL = new BLL.T_Sys_Department();
@@ -69,10 +69,10 @@ namespace CallCenterApi.Interface.Controllers
         }
         public ActionResult GetZTreeNew()
         {
-          
+
             DataTable dt = new DataTable();
-            dt = new BLL.T_Sys_Department ().GetList(" 1=1 and   F_IsDept = 1 and F_State = 0 and F_layer = 1").Tables[0];
-            string sqltest = "      with cte(F_DeptId  ,F_DeptName ,F_PartentId ,F_Layer,F_State,F_IsDept) as (select F_DeptId, F_DeptName, F_PartentId, F_Layer, F_State, F_IsDept from T_Sys_Department where F_IsDept = 1 and F_State = 0 and F_layer = 1 UNION all select t.F_DeptId, t.F_DeptName,t.F_PartentId,t.F_Layer,t.F_State,t.F_IsDept   from T_Sys_Department as t inner join cte as c on c.F_DeptId = t.F_PartentId )select * from cte  ";
+            dt = new BLL.T_Sys_Department ().GetList(" 1=1 and F_IsDept =1   and F_State = 0 ").Tables[0];
+            string sqltest = "      with cte(F_DeptId  ,F_DeptName ,F_PartentId ,F_Layer,F_State,F_IsDept) as (select F_DeptId, F_DeptName, F_PartentId, F_Layer, F_State, F_IsDept from T_Sys_Department where F_IsDept =1 and F_State = 0  UNION all select t.F_DeptId, t.F_DeptName,t.F_PartentId,t.F_Layer,t.F_State,t.F_IsDept   from T_Sys_Department as t inner join cte as c on c.F_DeptId = t.F_PartentId )select * from cte  ";
             var tab2 = DbHelperSQL.Query(sqltest).Tables[0];
             List<TreeModelNew> modelList = BindTreeNew(dt, "0", tab2);
           
@@ -85,6 +85,8 @@ namespace CallCenterApi.Interface.Controllers
           
 
         }
+
+
         public class TreeModelNew
         {
             private string _id;
@@ -237,7 +239,7 @@ namespace CallCenterApi.Interface.Controllers
 
             if (tab != null && tab.Rows.Count > 0)
             {
-                List<Model.T_Sys_Department > categorylist = new BLL.T_Sys_Department().DataTableToList(tab);
+                List<Model.T_Sys_Department > categorylist = DataTableToList1(tab);
                 List<TreeModelNew> modelList = new List<TreeModelNew>(categorylist.Count);
                 for (int i = 0; i < categorylist.Count; i++)
                 {

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/customer/AddressBookController.cs

@@ -143,9 +143,14 @@ namespace CallCenterApi.Interface.Controllers.customer
             {
                 return Error("手机号不能为空");
             }
+            if (User.F_RoleCode != "GLY")
+            {
+                return Error("权限不足");
+            }
             if (id == 0)
             {
-                model.F_Name = F_Name;
+               
+              model.F_Name = F_Name;
                 model.F_Sex = F_Sex;
                 //model.F_Birthday = Convert.ToDateTime(F_Birthday);
                 //model.F_IDCard = F_IDCard;
@@ -171,6 +176,7 @@ namespace CallCenterApi.Interface.Controllers.customer
             }
             else
             {
+             
                 model = bll.GetModel(id);
                 if (model != null)
                 {
@@ -209,6 +215,10 @@ namespace CallCenterApi.Interface.Controllers.customer
         /// <returns></returns>
         public ActionResult DelAddressBook(string[] ids)
         {
+            if (User.F_RoleCode != "GLY")
+            {
+                return Error("权限不足");
+            }
             if (ids != null && ids.Length > 0)
             {
                 string idd = " ";

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/tel/CallrecordsController.cs

@@ -62,6 +62,11 @@ namespace CallCenterApi.Interface.Controllers.tel
             {
                 sql += " and F_CallInType = '" + type + "' ";
             }
+            if (User .F_RoleCode == "ZXHWY")
+            {
+                sql += " and UserCode in(" + User .F_UserCode  + ")";
+            }
+           
             if (usercode != null && usercode.Trim() != "")
             {
                 sql += " and UserCode in(" + usercode + ")";

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs

@@ -494,7 +494,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 }
                 //20190715调整导出字段 zhengbingbing
                 //日期，工单号，诉求标题，诉求内容，承办单位，办理结果，是否满意，备注
-                var dtdc = DbHelperSQL.Query(" select  F_CreateTime 日期, F_CusName 姓名, dbo.GetUserName(F_CreateUser ) 受话员姓名,F_CusPhone 手机号,F_WorkOrderId 工单号,F_ComTitle 诉求标题,F_ComContent 诉求内容,dbo.GetKeyName(F_Key,0) 反映类别一, dbo.GetKeyName(F_Key,1) 反映类别二,dbo.GetKeyName(F_Key,2) 反映类别三,dbo.GetKeyName(F_Key,3) 反映类别四,"
+                var dtdc = DbHelperSQL.Query(" select  F_CreateTime 日期, F_CusName 姓名, dbo.GetUserName(F_CreateUser ) 受话员姓名,F_CusPhone 手机号,F_WorkOrderId 工单号,F_ComTitle 诉求标题,F_ComContent 工单内容,dbo.GetKeyName(F_Key,0) 反映类别一, dbo.GetKeyName(F_Key,1) 反映类别二,dbo.GetKeyName(F_Key,2) 反映类别三,dbo.GetKeyName(F_Key,3) 反映类别四,"
                     + "  dbo.GetDeptNames(F_MainDeptId ) 主办单位, "
                     + " F_Result 办理结果, "
                     + " (select top 1 (case F_IsSatisfie when 1 then'满意' when 0 then '不满意' else '未评价' end) F_Satisfie from T_Bus_VisitResult WITH(NOLOCK) where F_State = 1 and F_IsDelete = 0 and F_WorkOrderId = a.F_WorkOrderId order by F_Id desc) 是否满意 "
@@ -872,7 +872,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 }
                 //20190715调整导出字段 zhengbingbing
                 //日期，工单号，诉求标题，诉求内容，承办单位，办理结果，是否满意，备注
-                var dtdc = DbHelperSQL.Query(" select  ROW_NUMBER() OVER(ORDER BY F_CreateTime desc)  序号,F_CreateTime 日期, F_WorkOrderId 工单号,F_ComTitle 诉求标题,F_ComContent 诉求内容,dbo.GetDictionaryName(F_Key) 反映类别, "
+                var dtdc = DbHelperSQL.Query(" select  ROW_NUMBER() OVER(ORDER BY F_CreateTime desc)  序号,F_CreateTime 日期, F_WorkOrderId 工单号,F_ComTitle 诉求标题,F_ComContent 工单内容,dbo.GetDictionaryName(F_Key) 反映类别, "
                     + "  dbo.GetDeptNames(F_MainDeptId ) 主办单位, "
                     + " (select top 1 F_Result from T_Bus_Feedback WITH(NOLOCK) where F_State=1 and F_Type!=3 and F_IsDelete=0 and  F_WorkOrderId =a.F_WorkOrderId order by F_Id desc) 办理结果, "
                     + " F_CusName 来电人姓名 ,F_CusPhone  来电人手机号 "
@@ -1395,7 +1395,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 }
                 //20190715调整导出字段 zhengbingbing
                 //日期，工单号，诉求标题，诉求内容，承办单位，办理结果，是否满意，备注
-                var dtdc = DbHelperSQL.Query(" select  ROW_NUMBER() OVER(ORDER BY F_CreateTime desc)  序号,F_CreateTime 日期, F_WorkOrderId 工单号,F_ComTitle 诉求标题,F_ComContent 诉求内容,dbo.GetDictionaryName(F_Key) 反映类别, "
+                var dtdc = DbHelperSQL.Query(" select  ROW_NUMBER() OVER(ORDER BY F_CreateTime desc)  序号,F_CreateTime 日期, F_WorkOrderId 工单号,F_ComTitle 诉求标题,F_ComContent 工单内容,dbo.GetDictionaryName(F_Key) 反映类别, "
                     + "  dbo.GetDeptNames(F_MainDeptId ) 主办单位, "
                     + " (select top 1 F_Result from T_Bus_Feedback WITH(NOLOCK) where F_State=1 and F_Type!=3 and F_IsDelete=0 and  F_WorkOrderId =a.F_WorkOrderId order by F_Id desc) 办理结果, "
                     + " F_CusName 来电人姓名 ,F_CusPhone  来电人手机号 "
@@ -1803,7 +1803,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 }
                 //20190715调整导出字段 zhengbingbing
                 //日期，工单号，诉求标题，诉求内容，承办单位，办理结果，是否满意，备注
-                var dtdc = DbHelperSQL.Query(" select  F_CreateTime 日期, F_WorkOrderId 工单号,F_ComTitle 诉求标题,F_ComContent 诉求内容,dbo.GetDictionaryName(F_Key) 主题词, "
+                var dtdc = DbHelperSQL.Query(" select  F_CreateTime 日期, F_WorkOrderId 工单号,F_ComTitle 诉求标题,F_ComContent 工单内容,dbo.GetDictionaryName(F_Key) 主题词, "
                       + "  dbo.GetDeptNames(F_MainDeptId ) 主办单位, "
 
                     + " (select top 1 F_Result from T_Bus_Feedback WITH(NOLOCK) where F_State=1 and F_Type!=3 and F_IsDelete=0 and  F_WorkOrderId =wo.F_WorkOrderId order by F_Id desc) 办理结果, "
@@ -2001,7 +2001,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         btns.Remove(butt); 
                     if (Int32.Parse(strtab) == 0 && state == 7)
                     {
-                        if (User.F_RoleCode.ToUpper() != "ZXHWY")
+                       // if (User.F_RoleCode.ToUpper() != "ZXHWY")
                         btns.Add(ButtonGroup.turnsee());
                     }
                     if (Int32.Parse(strtab) == 0 && state == 3)
@@ -2624,7 +2624,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 }
                 //20190715调整导出字段 zhengbingbing
                 //日期，工单号，诉求标题，诉求内容，承办单位，办理结果，是否满意，备注
-                var dtdc = DbHelperSQL.Query(" select " + top + " F_CreateTime 日期, F_WorkOrderId 工单号,F_ComTitle 诉求标题,F_ComContent 诉求内容,dbo.GetDictionaryName(F_Key) 主题词, "
+                var dtdc = DbHelperSQL.Query(" select " + top + " F_CreateTime 日期, F_WorkOrderId 工单号,F_ComTitle 诉求标题,F_ComContent 工单内容,dbo.GetDictionaryName(F_Key) 主题词, "
                      + "  dbo.GetDeptNames(F_MainDeptId ) 主办单位, "
                     + " (select top 1 F_Result from T_Bus_Feedback WITH(NOLOCK) where F_State=1 and F_Type!=3 and F_IsDelete=0 and  F_WorkOrderId =wo.F_WorkOrderId order by F_Id desc) 办理结果, "
                     + " (select top 1 (case F_IsSatisfie when 1 then'满意' when 0 then '不满意' else '未评价' end) F_Satisfie from T_Bus_VisitResult WITH(NOLOCK) where F_State = 1 and F_IsDelete = 0 and F_WorkOrderId = wo.F_WorkOrderId order by F_Id desc) 是否满意 "
@@ -3410,7 +3410,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 }
                 //20190715调整导出字段 zhengbingbing
                 //日期，工单号，诉求标题，诉求内容，承办单位，办理结果，是否满意，备注
-                var dtdc = DbHelperSQL.Query(" select  F_CreateTime 日期, F_WorkOrderId 工单号,F_ComTitle 诉求标题,F_ComContent 诉求内容,dbo.GetDictionaryName(F_Key) 主题词, "
+                var dtdc = DbHelperSQL.Query(" select  F_CreateTime 日期, F_WorkOrderId 工单号,F_ComTitle 诉求标题,F_ComContent 工单内容,dbo.GetDictionaryName(F_Key) 主题词, "
                     + "  dbo.GetDeptNames(F_MainDeptId ) 主办单位, "
 
                     + " F_Result 办理结果 "
@@ -4804,7 +4804,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             //(select TOP 1 F_LimitTime from T_Bus_AssignedInfo_Next WITH(NOLOCK) where F_State=1 and F_IsDelete=0 and F_WorkOrderId=a.F_WorkOrderId) as
             if (isdc > 0)
             {
-                var dtdc = DbHelperSQL.Query(" select  F_CreateTime 日期, F_WorkOrderId 工单号,F_ComTitle 诉求标题,F_ComContent 诉求内容,dbo.GetDictionaryName(F_Key) 主题词, "
+                var dtdc = DbHelperSQL.Query(" select  F_CreateTime 日期, F_WorkOrderId 工单号,F_ComTitle 诉求标题,F_ComContent 工单内容,dbo.GetDictionaryName(F_Key) 主题词, "
                     + "  dbo.GetDeptNames(F_MainDeptId ) 主办单位, "
                     + " (select top 1 F_Result from T_Bus_Feedback WITH(NOLOCK) where F_State=1 and F_Type!=3 and F_IsDelete=0 and  F_WorkOrderId =a.F_WorkOrderId order by F_Id desc) 办理结果, "
                     + " (select top 1 (case F_IsSatisfie when 1 then'满意' when 0 then '不满意' else '未评价' end) F_Satisfie from T_Bus_VisitResult WITH(NOLOCK) where F_State = 1 and F_IsDelete = 0 and F_WorkOrderId = a.F_WorkOrderId order by F_Id desc) 是否满意 ,"
@@ -5573,7 +5573,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 }
                 //20190715调整导出字段 zhengbingbing
                 //日期，工单号，诉求标题，诉求内容，承办单位，办理结果，是否满意，备注
-                var dtdc = DbHelperSQL.Query(" select " + top + " F_CreateTime 日期, F_WorkOrderId 工单号,F_ComTitle 诉求标题,F_ComContent 诉求内容,dbo.GetDictionaryName(F_Key) 主题词, "
+                var dtdc = DbHelperSQL.Query(" select " + top + " F_CreateTime 日期, F_WorkOrderId 工单号,F_ComTitle 诉求标题,F_ComContent 工单内容,dbo.GetDictionaryName(F_Key) 主题词, "
                  + "  dbo.GetDeptNames(F_MainDeptId ) 主办单位, "
 
                     + " (select top 1 F_Result from T_Bus_Feedback WITH(NOLOCK) where F_State=1 and F_Type!=3 and F_IsDelete=0 and  F_WorkOrderId =wo.F_WorkOrderId order by F_Id desc) 办理结果, "
@@ -6003,7 +6003,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 {
                     top = " top 1000 "; orderby += " desc ";
                 }
-                var dtdc = DbHelperSQL.Query(" select  F_CreateTime 日期, F_WorkOrderId 工单号,F_ComTitle 诉求标题,F_ComContent 诉求内容,dbo.GetDictionaryName(F_Key) 主题词, "
+                var dtdc = DbHelperSQL.Query(" select  F_CreateTime 日期, F_WorkOrderId 工单号,F_ComTitle 诉求标题,F_ComContent 工单内容,dbo.GetDictionaryName(F_Key) 主题词, "
    + "  dbo.GetDeptNames(F_MainDeptId ) 主办单位, "
                    + " (select top 1 F_Result from T_Bus_Feedback WITH(NOLOCK) where F_State=1 and F_Type!=3 and F_IsDelete=0 and  F_WorkOrderId =wo.F_WorkOrderId order by F_Id desc) 办理结果, "
                    + " (select top 1 (case F_IsSatisfie when 1 then'满意' when 0 then '不满意' else '未评价' end) F_Satisfie from T_Bus_VisitResult WITH(NOLOCK) where F_State = 1 and F_IsDelete = 0 and F_WorkOrderId = wo.F_WorkOrderId order by F_Id desc) 是否满意 "
@@ -7489,7 +7489,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 {
                     top = " top 1000 "; orderby += " desc ";
                 }
-                var dtdc = DbHelperSQL.Query(" select " + top + " F_CreateTime 日期, F_WorkOrderId 工单号,F_ComTitle 诉求标题,F_ComContent 诉求内容,dbo.GetDictionaryName(F_Key) 主题词, "
+                var dtdc = DbHelperSQL.Query(" select " + top + " F_CreateTime 日期, F_WorkOrderId 工单号,F_ComTitle 诉求标题,F_ComContent 工单内容,dbo.GetDictionaryName(F_Key) 主题词, "
                    + "  dbo.GetDeptNames((select top 1 F_MainDeptId from T_Bus_AssignedInfo where F_WorkOrderId=wo.F_WorkOrderId order by F_Id desc  )) 主办单位, "
 
                    + " (select top 1 F_Result from T_Bus_Feedback WITH(NOLOCK) where F_State=1 and F_Type!=3 and F_IsDelete=0 and  F_WorkOrderId =wo.F_WorkOrderId order by F_Id desc) 办理结果, "
@@ -9042,7 +9042,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             oper.F_WorkOrderId = workorderid;
                             oper.F_AssignedId = 0;
                             oper.F_State = modelT_Bus_WorkOrder.F_WorkState;
-                            oper.F_Message = userinfo + " 修改了来电内容，原内容：" + message;
+                            oper.F_Message = userinfo + " 修改了工单内容，原内容：" + message;
                             oper.F_CreateUser = User.F_UserCode;
                             oper.F_CreateTime = DateTime.Now;
                             oper.F_IsDelete = 0;
@@ -16907,6 +16907,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 Model.T_Bus_AssignedInfo modelT_Bus_AssignedInfo = assignBLL.GetNewModelByWorkOrderID(workorderid);
                 Dictionary<string, object> keyValuePairs = new Dictionary<string, object>();
                 Model.T_Bus_VisitResult modelT_Bus_VisitResult = new Model.T_Bus_VisitResult();
+                if(string .IsNullOrEmpty (visituser))
+                {
+                    visituser = User.F_UserCode;
+                }
                 if (modelT_Bus_WorkOrder != null)
                 {
                     if (modelT_Bus_WorkOrder.F_WorkState == (int)EnumWorkState.dealed|| modelT_Bus_WorkOrder.F_WorkState == (int)EnumWorkState.visit )