bug修改

codegit/CallCenterApi/CallCenterApi.BLL/T_Bus_WorkOrder.cs

@@ -76,6 +76,8 @@ namespace CallCenterApi.BLL
         {
             return dal.GetList(strWhere);
         }
+      
+
         /// <summary>
         /// 获得前几行数据
         /// </summary>
@@ -92,6 +94,24 @@ namespace CallCenterApi.BLL
             return DataTableToList(ds.Tables[0]);
         }
         /// <summary>
+        ///工单导出
+        /// </summary>
+        /// <param name="strWhere"></param>
+        /// <returns></returns>
+        public DataSet GetListExpt(string strWhere)
+        {
+            return dal.GetListExpt(strWhere);
+        }
+        /// <summary>
+        ///工单导出
+        /// </summary>
+        /// <param name="strWhere"></param>
+        /// <returns></returns>
+        public DataSet GetListTSExpt(string strWhere)
+        {
+            return dal.GetListTSExpt(strWhere);
+        }
+        /// <summary>
         /// 获得数据列表
         /// </summary>
         public List<CallCenterApi.Model.T_Bus_WorkOrder> DataTableToList(DataTable dt)

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/ApplicationsVersionController.cs

@@ -257,6 +257,7 @@ namespace CallCenterApi.Interface.Controllers
                 return Error("无操作权限！");
             }
         }
+        private BLL.T_Sys_UserAccount userBLL = new BLL.T_Sys_UserAccount();
         /// <summary>
         /// 上传附件
         /// </summary>
@@ -264,7 +265,7 @@ namespace CallCenterApi.Interface.Controllers
         public ActionResult UploadFile()
         {
             int userId = CurrentUser.UserData.F_UserId;
-            Model.T_Sys_UserAccount userModel = new BLL.T_Sys_UserAccount().GetModel(userId);
+            Model.T_Sys_UserAccount userModel = userBLL.GetModel(userId);
 
             #region 多个上传
             HttpFileCollection files = RequestString.GetFiles();

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

@@ -47,9 +47,9 @@ namespace CallCenterApi.Interface.Controllers
             {
                 DataTable dt = new DataTable();
                 string where = " ";
-                where = "isnull(F_ParentId, 1) = '" + pId + "' and F_State = 1 and F_Layer = " + F_Layer;
+                where = " isnull(F_DeptId,0) = '" + 1 + "' and F_State = 1" ;
                 dt = new BLL.T_Sys_Department().GetList(0, where, " F_Sort asc").Tables[0];
-                List<Model.TreeModel> modelList = BindAreaTree(dt, "0");
+               List<Model.TreeModel> modelList = BindAreaTree(dt, "0", 1);
                 return Success("加载成功", modelList);
             }
             return NoToken("未知错误，请重新登录");
@@ -201,7 +201,7 @@ namespace CallCenterApi.Interface.Controllers
         /// <param name="tab"></param>
         /// <param name="parentid"></param>
         /// <returns></returns>
-        private List<Model.TreeModel> BindAreaTree(DataTable tab, string parentid)
+        private List<Model.TreeModel> BindAreaTree(DataTable tab, string parentid,int pid=0)
         {
             DataTable tab2 = new DataTable();
 
@@ -216,10 +216,18 @@ namespace CallCenterApi.Interface.Controllers
                     model.id = currentID;
                     model.IconCls = "";//图标
                     model.text = categorylist[i].F_DeptName;
-                    tab2 = new BLL.T_Sys_Department().GetList("F_ParentId=" + currentID + " and F_State=1 order by f_sort").Tables[0];
+                    if (pid==1)
+                    {
+                              tab2 = new BLL.T_Sys_Department().GetList("F_ParentId=" + currentID + " and F_State=1    and F_Layer = 1 order by f_sort").Tables[0];
+                    }
+                    else
+                    {
+                        tab2 = new BLL.T_Sys_Department().GetList("F_ParentId=" + currentID + " and F_State=1 order by f_sort").Tables[0];
+                    }
+                  
                     if (tab2 != null && tab2.Rows.Count > 0)
                     {
-                        model.children = BindBreaTree(tab2, currentID);
+                        model.children = BindBreaTree(tab2, currentID, pid);
                     }
                     modelList.Add(model);
                 }
@@ -238,7 +246,7 @@ namespace CallCenterApi.Interface.Controllers
         /// <param name="tab"></param>
         /// <param name="parentid"></param>
         /// <returns></returns>
-        private List<Model.TreeModel> BindBreaTree(DataTable tab, string parentid)
+        private List<Model.TreeModel> BindBreaTree(DataTable tab, string parentid,int pid=0)
         {
             DataTable tab2 = new DataTable();
 
@@ -254,7 +262,13 @@ namespace CallCenterApi.Interface.Controllers
                     model.IconCls = "";//图标
                     model.text = categorylist[i].F_DeptName;
                     tab2 = new BLL.T_Sys_Department().GetList("F_ParentId=" + currentID + " and F_State=1 order by f_sort").Tables[0];
-                    
+                    if (pid >0)
+                    {
+                        if (tab2 != null && tab2.Rows.Count > 0)
+                        {
+                            model.children = BindBreaTree(tab2, currentID, 0);
+                        }
+                    }
                     modelList.Add(model);
                 }
                 return modelList;

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

@@ -226,7 +226,7 @@ namespace CallCenterApi.Interface.Controllers
                 if (userModel != null)
                 {
                     if (userModel.F_RoleId == 1 || userModel.F_RoleId == 4 || userModel.F_RoleId == 17
-                         || userModel.F_RoleId == 50 || userModel.F_RoleId == 67 || userModel.F_RoleId == 49)
+                         || userModel.F_RoleId == 50 || userModel.F_RoleId == 67 || userModel.F_RoleId == 49 || userModel.F_RoleId == 66)
                     {
                         if (filter.dptid == 0)
                         {
@@ -344,7 +344,7 @@ namespace CallCenterApi.Interface.Controllers
                 if (userModel != null)
                 {
                     if (userModel.F_RoleId == 1 || userModel.F_RoleId == 4 || userModel.F_RoleId == 17
-                          || userModel.F_RoleId == 50 || userModel.F_RoleId == 67 || userModel.F_RoleId == 49)
+                          || userModel.F_RoleId == 50 || userModel.F_RoleId == 67 || userModel.F_RoleId == 49 || userModel.F_RoleId == 66)
                     {
                             if (filter.dptid == 0)
                             {

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|16|%'or F_DeptCode like '|0|1|17|%' )) ");
+            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|21|%' or F_DeptCode like '|0|1|22|%' )) ");
            
             #region 
             dt.Columns.Add("工号");
@@ -915,7 +915,7 @@ namespace CallCenterApi.Interface.Controllers.customer
                 #endregion
             }
             NPOIHelper npoi = new NPOIHelper();
-            if (npoi.ExportToExcel("京津河北大区人员表", dt) == "")
+            if (npoi.ExportToExcel("华南大区人员表", dt) == "")
             {
                 return Success("导出成功");
             }