bug

codegit/CallCenterApi/CallCenterApi.DAL/T_RepositoryCategory.cs

@@ -123,8 +123,8 @@ F_visibleDeptId,F_visibleDeptName)");
             strSql.Append("F_Expand2=@F_Expand2,");
             strSql.Append("F_CreateOn=@F_CreateOn,");
             strSql.Append("F_CreateBy=@F_CreateBy,");
-            strSql.Append("F_DeleteFlag=@F_DeleteFlag");
-            strSql.Append("F_visibleDeptId=@F_visibleDeptId");
+            strSql.Append("F_DeleteFlag=@F_DeleteFlag,");
+            strSql.Append("F_visibleDeptId=@F_visibleDeptId,");
             strSql.Append("F_visibleDeptName=@F_visibleDeptName");
             strSql.Append(" where F_CategoryId=@F_CategoryId");
             SqlParameter[] parameters = {

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

@@ -505,6 +505,69 @@ namespace CallCenterApi.Interface.Controllers
             return NoToken("未知错误，请重新登录");
         }
 
+
+        /// <summary>
+        /// 获取all部门列表
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult GetAllDeptList()
+        {
+            if (Request.IsAuthenticated)
+            {
+                //int userId = CurrentUser.UserData.F_UserId;
+                //Model.T_Sys_UserAccount userModel = new BLL.T_Sys_UserAccount().GetModel(userId);
+
+                //if (userModel != null)
+                //    pId = userModel.F_DeptId;
+                //Model.T_Sys_RoleInfo ro = rolebll.GetModel(userModel.F_RoleId);
+                string where = "";
+                DataTable dt = new DataTable();
+                //if (ro != null)
+                //{
+                //    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)
+                //{
+                //    where = "(isnull(F_DeptId,0)='" + pId + "'or F_Layer=1 ) and F_State=1";
+                //}
+                //else if (pId == 421)
+                //{
+                //    where = "isnull(F_DeptId,0)='" + 1 + "'and F_State=1";
+                //}
+                //else
+                //{
+                    where = "  isnull(F_DeptId,0)='1' and F_State=1  ";
+               // }
+
+                //if (!string.IsNullOrEmpty(userModel.groupcode))
+                //{
+                //    where += " and F_GroupCode = '" + userModel.groupcode + "'";
+                //}
+                dt = new BLL.T_Sys_Department().GetList(0, where, " F_Sort asc").Tables[0];
+
+                List<Model.TreeModel> modelList = BindTree(dt, "0");
+
+                if (modelList != null)
+                {
+                    if (modelList.Count > 0)
+                        return Success("加载成功", modelList);
+                }
+                return Error("加载失败");
+            }
+            return NoToken("未知错误，请重新登录");
+        }
+
+
+
+
+
+
+
         /// <summary>
         /// tree  树形部门
         /// </summary>

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/RegRecords/RegRecordsController.cs

@@ -27,7 +27,7 @@ namespace CallCenterApi.Interface.Controllers.RegRecords
             }
             if (!string.IsNullOrWhiteSpace(key))
             {
-                sql += " and (F_RecCode like '%" + key.Trim() + "%' or F_Complained like '%" + key.Trim() + "%' or F_Content like '%" + key.Trim() + "%' or F_Remark like '%" + key.Trim() + "%')";
+                sql += " and ( F_Unit like '%" + key.Trim() + "%' or F_RecCode like '%" + key.Trim() + "%' or F_Complained like '%" + key.Trim() + "%' or F_Content like '%" + key.Trim() + "%' or F_Remark like '%" + key.Trim() + "%')";
             }
             if (!string.IsNullOrWhiteSpace(tel))
             {
@@ -48,39 +48,55 @@ namespace CallCenterApi.Interface.Controllers.RegRecords
             {
                 sql += " and F_CreateOn < '" + Convert.ToDateTime(endtime.Trim()) + "' ";
             }
-            if (innerType==0) {
+            if (innerType == 0)
+            {
                 //转移
                 if (CurrentUser.UserData.F_DeptId == 1)
                 {
                     sql += " and(  F_Id in(select F_CustomerId from T_Sys_ATheChangeLog  where isnull(F_type,0)=0 ))";
                 }
-                else {
+                else
+                {
                     sql += " and(  F_Id in(select F_CustomerId from T_Sys_ATheChangeLog  where isnull(F_type,0)=0 and F_Bdeptid=" + CurrentUser.UserData.F_DeptId + "))";
                 }
-                
+               
 
             }
-            if (innerType == 1)
+            else if (innerType == 1)
             {
-                if (CurrentUser.UserData.F_DeptId == 1) {
-                     sql += " and(  F_Id in(select (	select F_CustomerId from T_Sys_ATheChangeLog where F_Id=F_ATheChangeLog) from T_Sys_BTheChangeLog ) )";
+                if (CurrentUser.UserData.F_DeptId == 1)
+                {
+                    sql += " and(  F_Id in(select (	select F_CustomerId from T_Sys_ATheChangeLog where F_Id=F_ATheChangeLog) from T_Sys_BTheChangeLog ) )";
                     //sql += " and (F_Id in(	select F_CustomerId from T_Sys_ATheChangeLog   ))";
                 }
-                else{
+                else
+                {
                     sql += " and(  F_Id in(select (	select F_CustomerId from T_Sys_ATheChangeLog where F_Id=F_ATheChangeLog) from T_Sys_BTheChangeLog  where F_deptid=" + CurrentUser.UserData.F_DeptId + ") )";
                 }
                 //转入
-               
-            }
-            if (Zsz!="") {
-                sql += " and (  F_ZXZType='" + CurrentUser.UserData.F_SeartGroup+"')";
+
+                //已接收非本部门的数据不可看到
+                sql += @" and (isnull((
+select F_Bdeptid from T_Sys_ATheChangeLog where F_CustomerId=T_Rec_RegRecords.F_Id and F_type=1 ),0)=0 or
+isnull((
+select F_Bdeptid from T_Sys_ATheChangeLog where F_CustomerId=T_Rec_RegRecords.F_Id and F_type=1 ),0)=
+" + CurrentUser.UserData.F_DeptId + ")";
+
+
             }
-            //已接收非本部门的数据不可看到
-            sql += @" and (isnull((
+            else {
+
+                //已接收非本部门的数据不可看到
+                sql += @" and (isnull((
 select F_Bdeptid from T_Sys_ATheChangeLog where F_CustomerId=T_Rec_RegRecords.F_Id and F_type=1 ),0)=0 or
 isnull((
 select F_Bdeptid from T_Sys_ATheChangeLog where F_CustomerId=T_Rec_RegRecords.F_Id and F_type=1 ),0)<>
-"+ CurrentUser.UserData.F_DeptId +")";
+" + CurrentUser.UserData.F_DeptId + ")";
+            }
+            if (Zsz!="") {
+                sql += " and (  F_ZXZType='" + Zsz + "')";
+            }
+          
             
             #endregion
             int recordCount = 0;

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

@@ -70,6 +70,10 @@ namespace CallCenterApi.Interface.Controllers.tel
             {
                 sql += " and datediff(day,BeginTime,'" + endtime + "')>=0 ";
             }
+            if (workordercode!="") {
+                sql += " and (select F_RecCode from T_Rec_RegRecords where T_Rec_RegRecords.F_CallId=T_Call_CallRecords.CallId) like '"+ workordercode + "'";
+            }
+                
 
             if (strpageindex.Trim() != "")
             {