2.5.4

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/knowledge/KnowledgeController.cs

@@ -14,7 +14,7 @@ namespace CallCenterApi.Interface.Controllers.knowledge
     {
         BLL.T_RepositoryInformation infoBLL = new BLL.T_RepositoryInformation();
         // 获取知识库列表
-        public ActionResult GetList(string title, string content,string keywords, string pid)
+        public ActionResult GetList(string title, string content,string keywords, string pid,int deptid=0)
         {
             string issub = RequestString.GetQueryString("issub");
             string ispass = RequestString.GetQueryString("ispass");
@@ -57,11 +57,16 @@ namespace CallCenterApi.Interface.Controllers.knowledge
             {
                 sql += " and F_CategoryId=" + pid.Trim();
             }
-                                                                                                                                                                                     if (keywords != null && keywords.Trim() != "")
+            if (keywords != null && keywords.Trim() != "")
             {
                 sql += " and (F_Description like '%" + keywords.Trim() + "%' or F_Content like '%" + keywords.Trim() + "%' or F_Title like '%"
                                                                                                                                                                                                  + keywords.Trim() + "%' or F_KeyWords like '%" + keywords.Trim() + "%')";
             }
+
+            if (deptid >0)
+            {
+                sql += "and   F_CreateBy in( select F_UserId from T_Sys_UserAccount where F_DeptId ='" + deptid + "')";
+            }
             if (strpageindex.Trim() != "")
             {                    
                 pageindex = Convert.ToInt32(strpageindex);

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

@@ -1877,7 +1877,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             string cols = "";
             cols = "F_WorkOrderId,F_InfoSource,F_CusName,F_ComTitle,F_WorkState,F_MainDeptId,F_OtherDeptIds,F_DealTime,F_LeaveRecordId,F_CallRecordId,F_IsResult,F_IsProtect,F_IsReturn,F_CreateTime,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDictionaryName(F_InfoType) as TypeName,dbo.GetDictionaryName(F_InfoSource) as SourceName,(select top 1 F_Result from T_Bus_Feedback WITH(NOLOCK)  where F_Type=3 and F_State=1 and F_IsDelete=0" +
               "and F_WorkOrderId=a.F_WorkOrderId order by F_CreateTime desc ) as Backreason ,F_CloseTime,F_Identification,F_IsRelease,F_InfoSource,F_Note" +
-              ",(case when PATINDEX('%" + User.F_UserCode + "%',a.F_See)= 0  then 0  when  PATINDEX('%" + User.F_UserCode + "%',a.F_See) IS NULL then 0 else 1 end) as See";
+              ",(case when PATINDEX('%''" + User.F_DeptId  + "''%',a.F_See)= 0  then 0  when  PATINDEX('%''" + User.F_DeptId + "''%',a.F_See) IS NULL then 0 else 1 end) as See";
             if (smspy > -1)
             {
                 order = "  order by F_Id  desc";
@@ -2695,7 +2695,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             else
             {
                 cols = "F_WorkOrderId,F_CusName,F_ComTitle,F_WorkState,F_MainDeptId,F_OtherDeptIds,F_DealTime,F_LeaveRecordId,F_CallRecordId,F_IsResult,F_IsProtect,F_IsReturn,F_CreateTime,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDictionaryName(F_InfoType) as TypeName, dbo.GetDeptNames(F_MainDeptId)as DeptNames,dbo.GetDictionaryName(F_InfoSource) as SourceName,F_CloseTime,F_ComContent,F_Identification,F_IsRelease,F_InfoSource" +
-                    ",(case when PATINDEX('%" + User.F_UserCode + "%',a.F_See)= 0  then 0  when  PATINDEX('%" + User.F_UserCode + "%',a.F_See) IS NULL then 0 else 1 end) as See";
+                    ",(case when PATINDEX('%''" + User.F_DeptId + "''%',a.F_See)= 0  then 0  when  PATINDEX('%''" + User.F_DeptId + "''%',a.F_See) IS NULL then 0 else 1 end) as See";
             }
             if (isdc > 0)
             {
@@ -3484,7 +3484,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             //    + "dbo.GetDictionaryName(F_InfoSource) as SourceName,dbo.GetWorkOrderAssign(F_WorkOrderId) as DeptName ,dbo.GetLimitTime(F_WorkOrderId) as LimitTime";
             //string cols = "*,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDictionaryName(F_InfoType) as TypeName,dbo.GetDictionaryName(F_InfoSource) as SourceName";
             string cols = "F_WorkOrderId,F_CusName,F_ComTitle,F_WorkState,F_MainDeptId,F_OtherDeptIds,F_DealTime,F_LeaveRecordId,F_CallRecordId,F_IsResult,F_IsProtect,F_IsReturn,F_CreateTime,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDictionaryName(F_InfoType) as TypeName,dbo.GetDictionaryName(F_InfoSource) as SourceName,dbo.GetDeptNames(F_MainDeptID3) AS EJDeptName,F_CloseTime,F_IsRelease,F_Identification,F_IsRelease,F_InfoSource " +
-                " ,(case when PATINDEX('%" + User.F_UserCode + "%',a.F_See)= 0  then 0  when  PATINDEX('%" + User.F_UserCode + "%',a.F_See) IS NULL then 0 else 1 end) as See";
+                " ,(case when PATINDEX('%''" + User.F_DeptId + "''%',a.F_See)= 0  then 0  when  PATINDEX('%''" + User.F_DeptId + "''%',a.F_See) IS NULL then 0 else 1 end) as See";
             if (isdc > 0)
             {
                 var top = " "; var orderby = " order by F_CreateTime";
@@ -8547,17 +8547,17 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             }
                             if(dt.Rows[0]["F_See"] != null)
                             {
-                                if (!dt.Rows[0]["F_See"].ToString ().Contains(User .F_UserCode ))
+                                if (!dt.Rows[0]["F_See"].ToString ().Contains("'"+User .F_DeptId + "'"))
                                 {
                                     Dictionary<string, object> keyValuePairs = new Dictionary<string, object>();
-                                    keyValuePairs.Add("F_See", dt.Rows[0]["F_See"].ToString()+","+ User.F_UserCode);
+                                    keyValuePairs.Add("F_See", dt.Rows[0]["F_See"].ToString()+",'"+ User.F_DeptId+"'");
                                     workorderBLL.UpdateWorkOrder(int .Parse (dt.Rows[0]["F_Id"].ToString()), keyValuePairs);
                                 }
                             }
                             else
                             {
                                 Dictionary<string, object> keyValuePairs = new Dictionary<string, object>();
-                                keyValuePairs.Add("F_See", User.F_UserCode);
+                                keyValuePairs.Add("F_See", "'" + User.F_DeptId + "'");
                                 workorderBLL.UpdateWorkOrder(int.Parse(dt.Rows[0]["F_Id"].ToString()), keyValuePairs);
                             }
                             #region 声音文件
@@ -8678,8 +8678,19 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     #endregion
                     case 4:
                         #region 办理情况
-                        string blsql = "select *,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDeptName(F_CreateDeptId) as DeptName from T_Bus_Feedback WITH(NOLOCK) where F_State=1 and F_Type!=3 and F_IsDelete=0 and  F_WorkOrderId ='" + strworkorderid + "' order by F_CreateTime";
-                        string ejblsql = "select *,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDeptName(F_CreateDeptId) as DeptName from T_Bus_Feedback_Next WITH(NOLOCK) where F_State=1 and F_Type!=3 and F_IsDelete=0 and  F_WorkOrderId ='" + strworkorderid + "' order by F_CreateTime";
+                        string blsql = "", ejblsql = "";
+                        if (User .F_RoleCode == "WLDW" || User.F_RoleCode == "EJWLDW")
+                        {
+                            blsql = "select TOP 1 *,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDeptName(F_CreateDeptId) as DeptName from T_Bus_Feedback WITH(NOLOCK) where F_State=1 and F_Type!=3 and F_IsDelete=0 and  F_WorkOrderId ='" + strworkorderid + "' order by F_CreateTime";
+                            ejblsql = "select TOP 1 *,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDeptName(F_CreateDeptId) as DeptName from T_Bus_Feedback_Next WITH(NOLOCK) where F_State=1 and F_Type!=3 and F_IsDelete=0 and  F_WorkOrderId ='" + strworkorderid + "' order by F_CreateTime";
+
+                        }
+                        else
+                        {
+                            blsql = "select *,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDeptName(F_CreateDeptId) as DeptName from T_Bus_Feedback WITH(NOLOCK) where F_State=1 and F_Type!=3 and F_IsDelete=0 and  F_WorkOrderId ='" + strworkorderid + "' order by F_CreateTime";
+                            ejblsql = "select *,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDeptName(F_CreateDeptId) as DeptName from T_Bus_Feedback_Next WITH(NOLOCK) where F_State=1 and F_Type!=3 and F_IsDelete=0 and  F_WorkOrderId ='" + strworkorderid + "' order by F_CreateTime";
+
+                        }
 
 
                         var bldt = DbHelperSQL.Query(blsql).Tables[0];

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Common/ButtonGroup.cs

@@ -896,16 +896,17 @@ namespace CallCenterApi.Interface.Models.Common
                             buttons.Add(auditdeal());
                         }
 
-                        if (code == "EJWLDW")
+                        
+                    }
+                    if (code == "EJWLDW")
+                    {
+                        if (ispd == "1")
                         {
-                            if (ispd == "1")
-                            {
-                                buttons.Add(sign()); //buttons.Add(refuse());
-                            }
-                            if (ispd == "2")
-                            {
-                                buttons.Add(feedback());
-                            }
+                            buttons.Add(sign()); //buttons.Add(refuse());
+                        }
+                        if (ispd == "2")
+                        {
+                            buttons.Add(feedback());
                         }
                     }
                     //调度专员 中心领导管理员 管理员