大区

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

@@ -417,7 +417,7 @@ namespace CallCenterApi.Interface.Controllers
                         " (select  F_RoleName  from T_Sys_RoleInfo where F_RoleId =a.F_RoleId ) 用户角色," +
                          " (select F_DeptName    from T_Sys_Department  where F_DeptId  =a.F_DeptId ) 部门," +
                           " F_WorkNumber 工号 " +
-                        " from T_Sys_UserAccount a WITH(NOLOCK) where 1=1 " + sql + "ORDER BY"+ sth).Tables[0];
+                        " from T_Sys_UserAccount a WITH(NOLOCK) where 1=1 " + sql + "ORDER BY "+ sth).Tables[0];
                     var msg = new NPOIHelper().ExportToExcel("用户列表", dtdc);
                     if (msg == "")
                     {

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/BusinessController.cs

@@ -429,20 +429,20 @@ namespace CallCenterApi.Interface.Controllers.report
         private string User(string DeptName )
         {
             string user="";
-             if (DeptName== "京津"|| DeptName == "豫南" || DeptName == "豫北" || DeptName == "吉林")
+             if (DeptName== "京津"|| DeptName == "豫南" || DeptName == "豫北" || DeptName == "吉林"||DeptName == "鲁西")
             {
                 var usermodel = new BLL.T_Sys_UserAccount().GetModel("8009");
                 if (usermodel != null)
                     user = usermodel.F_UserName;
 
             }
-            else if (DeptName == "鲁西" || DeptName == "华东" || DeptName == "鲁东")
-            {
-                var usermodel = new BLL.T_Sys_UserAccount().GetModel("8010");
-                if (usermodel != null)
-                    user = usermodel.F_UserName;
-            }
-            else if ( DeptName == "川渝" || DeptName == "湖南" || DeptName == "陕宁" || DeptName == "晋蒙"  || DeptName == "闽赣" || DeptName == "广东" || DeptName == "广海")
+            //else if (DeptName == "鲁西" || DeptName == "华东" || DeptName == "鲁东")
+            //{
+            //    var usermodel = new BLL.T_Sys_UserAccount().GetModel("8010");
+            //    if (usermodel != null)
+            //        user = usermodel.F_UserName;
+            //}
+            else if ( DeptName == "川渝" || DeptName == "湖南" || DeptName == "陕宁" || DeptName == "晋蒙"||DeptName == "华东" || DeptName == "闽赣" || DeptName == "广东" || DeptName == "广海")
             {
                 var usermodel = new BLL.T_Sys_UserAccount().GetModel("822353");
                 if (usermodel != null)
@@ -454,7 +454,7 @@ namespace CallCenterApi.Interface.Controllers.report
                 if (usermodel != null)
                     user = usermodel.F_UserName;
             }
-            else if ( DeptName == "辽宁" || DeptName == "黑龙江" || DeptName == "河北" || DeptName == "江苏" )
+            else if ( DeptName == "辽宁" || DeptName == "黑龙江" || DeptName == "河北" || DeptName == "江苏" || DeptName == "鲁东")
             {
               
 

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

@@ -2114,24 +2114,21 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 Model.T_Sys_Department dept2 = new BLL.T_Sys_Department().GetModelList("F_DeptName='豫南'").FirstOrDefault();
                 Model.T_Sys_Department dept3 = new BLL.T_Sys_Department().GetModelList("F_DeptName='豫北'").FirstOrDefault();
                 Model.T_Sys_Department dept5 = new BLL.T_Sys_Department().GetModelList("F_DeptName='吉林'").FirstOrDefault();
+                Model.T_Sys_Department dept6 = new BLL.T_Sys_Department().GetModelList("F_DeptName='鲁西'").FirstOrDefault();
 
-                dept += dept1.F_DeptId + "," + dept2.F_DeptId + "," + dept3.F_DeptId + "," + dept5.F_DeptId;
-            }
-            else if (ua.F_UserCode == "8010")
-            {
-                Model.T_Sys_Department dept1 = new BLL.T_Sys_Department().GetModelList("F_DeptName='鲁西'").FirstOrDefault();
-                Model.T_Sys_Department dept2 = new BLL.T_Sys_Department().GetModelList("F_DeptName='华东'").FirstOrDefault();
-                Model.T_Sys_Department dept3 = new BLL.T_Sys_Department().GetModelList("F_DeptName='鲁东'").FirstOrDefault();
-                dept += dept1.F_DeptId + "," + dept2.F_DeptId + "," + dept3.F_DeptId;
+                dept += dept1.F_DeptId + "," + dept2.F_DeptId + "," + dept3.F_DeptId + "," + dept5.F_DeptId + "," + dept6.F_DeptId;
             }
+          
             else if (ua.F_UserCode == "822249")
             {
+                Model.T_Sys_Department dept3 = new BLL.T_Sys_Department().GetModelList("F_DeptName='鲁东'").FirstOrDefault();
                 Model.T_Sys_Department dept1 = new BLL.T_Sys_Department().GetModelList("F_DeptName='辽宁'").FirstOrDefault();
                 Model.T_Sys_Department dept2 = new BLL.T_Sys_Department().GetModelList("F_DeptName='江苏'").FirstOrDefault();
-                Model.T_Sys_Department dept3 = new BLL.T_Sys_Department().GetModelList("F_DeptName='黑龙江'").FirstOrDefault();
+                Model.T_Sys_Department dept5 = new BLL.T_Sys_Department().GetModelList("F_DeptName='黑龙江'").FirstOrDefault();
                 Model.T_Sys_Department dept4 = new BLL.T_Sys_Department().GetModelList("F_DeptName='河北'").FirstOrDefault();
 
-                dept += dept1.F_DeptId + "," + dept2.F_DeptId + "," + dept3.F_DeptId + "," + dept4.F_DeptId;
+                dept += dept1.F_DeptId + "," + dept2.F_DeptId + "," + 
+                    dept3.F_DeptId + "," + dept4.F_DeptId + "," + dept5.F_DeptId;
             }
 
             else if (ua.F_UserCode == "822353")
@@ -2143,7 +2140,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 Model.T_Sys_Department dept5 = new BLL.T_Sys_Department().GetModelList("F_DeptName='闽赣'").FirstOrDefault();
                 Model.T_Sys_Department dept6 = new BLL.T_Sys_Department().GetModelList("F_DeptName='广东'").FirstOrDefault();
                 Model.T_Sys_Department dept7 = new BLL.T_Sys_Department().GetModelList("F_DeptName='广海'").FirstOrDefault();
-                dept += dept1.F_DeptId + "," + dept2.F_DeptId + "," + dept3.F_DeptId + "," + dept4.F_DeptId + "," + dept5.F_DeptId + "," + dept6.F_DeptId + "," + dept7.F_DeptId;
+                Model.T_Sys_Department dept8 = new BLL.T_Sys_Department().GetModelList("F_DeptName='华东'").FirstOrDefault();
+                dept += dept1.F_DeptId + "," + dept2.F_DeptId + "," + dept3.F_DeptId 
+                    + "," + dept4.F_DeptId + "," + dept5.F_DeptId + "," + dept6.F_DeptId + "," + dept7.F_DeptId + "," + dept8.F_DeptId;
             }
             else if (ua.F_UserCode == "8012")
             {

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkorderAppController.cs

@@ -1280,24 +1280,26 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 Model.T_Sys_Department dept2 = new BLL.T_Sys_Department().GetModelList("F_DeptName='豫南'").FirstOrDefault();
                 Model.T_Sys_Department dept3 = new BLL.T_Sys_Department().GetModelList("F_DeptName='豫北'").FirstOrDefault();
                 Model.T_Sys_Department dept5 = new BLL.T_Sys_Department().GetModelList("F_DeptName='吉林'").FirstOrDefault();
-               
-                dept += dept1.F_DeptId + "," + dept2.F_DeptId + "," + dept3.F_DeptId + "," + dept5.F_DeptId;
-            }
-            else if (ua.F_UserCode == "8010")
-            {
-                Model.T_Sys_Department dept1 = new BLL.T_Sys_Department().GetModelList("F_DeptName='鲁西'").FirstOrDefault();
-                Model.T_Sys_Department dept2 = new BLL.T_Sys_Department().GetModelList("F_DeptName='华东'").FirstOrDefault();
-                Model.T_Sys_Department dept3 = new BLL.T_Sys_Department().GetModelList("F_DeptName='鲁东'").FirstOrDefault();
-                dept += dept1.F_DeptId + "," + dept2.F_DeptId + "," + dept3.F_DeptId;
-            }
+                Model.T_Sys_Department dept6 = new BLL.T_Sys_Department().GetModelList("F_DeptName='鲁西'").FirstOrDefault();
+
+
+                dept += dept1.F_DeptId + "," + dept2.F_DeptId + "," + dept3.F_DeptId + "," + dept5.F_DeptId + "," + dept6.F_DeptId;
+            }
+            //else if (ua.F_UserCode == "8010")
+            //{
+            //    Model.T_Sys_Department dept1 = new BLL.T_Sys_Department().GetModelList("F_DeptName='鲁西'").FirstOrDefault();
+            //    Model.T_Sys_Department dept2 = new BLL.T_Sys_Department().GetModelList("F_DeptName='华东'").FirstOrDefault();
+            //    Model.T_Sys_Department dept3 = new BLL.T_Sys_Department().GetModelList("F_DeptName='鲁东'").FirstOrDefault();
+            //    dept += dept1.F_DeptId + "," + dept2.F_DeptId + "," + dept3.F_DeptId;
+            //}
             else if (ua.F_UserCode == "822249")
             {
                 Model.T_Sys_Department dept1 = new BLL.T_Sys_Department().GetModelList("F_DeptName='辽宁'").FirstOrDefault();
                 Model.T_Sys_Department dept2 = new BLL.T_Sys_Department().GetModelList("F_DeptName='江苏'").FirstOrDefault();
                 Model.T_Sys_Department dept3 = new BLL.T_Sys_Department().GetModelList("F_DeptName='黑龙江'").FirstOrDefault();
                 Model.T_Sys_Department dept4 = new BLL.T_Sys_Department().GetModelList("F_DeptName='河北'").FirstOrDefault();
-
-                dept += dept1.F_DeptId + "," + dept2.F_DeptId + "," + dept3.F_DeptId + "," + dept4.F_DeptId;
+                Model.T_Sys_Department dept6 = new BLL.T_Sys_Department().GetModelList("F_DeptName='鲁东'").FirstOrDefault();
+                dept += dept1.F_DeptId + "," + dept2.F_DeptId + "," + dept3.F_DeptId + "," + dept4.F_DeptId + "," + dept6.F_DeptId;
             }
 
             else if (ua.F_UserCode == "822353")
@@ -1309,7 +1311,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 Model.T_Sys_Department dept5 = new BLL.T_Sys_Department().GetModelList("F_DeptName='闽赣'").FirstOrDefault();
                 Model.T_Sys_Department dept6 = new BLL.T_Sys_Department().GetModelList("F_DeptName='广东'").FirstOrDefault();
                 Model.T_Sys_Department dept7 = new BLL.T_Sys_Department().GetModelList("F_DeptName='广海'").FirstOrDefault();
-                dept += dept1.F_DeptId + "," + dept2.F_DeptId + "," + dept3.F_DeptId + "," + dept4.F_DeptId + "," + dept5.F_DeptId + "," + dept6.F_DeptId + "," + dept7.F_DeptId;
+                Model.T_Sys_Department dept8 = new BLL.T_Sys_Department().GetModelList("F_DeptName='华东'").FirstOrDefault();
+                dept += dept1.F_DeptId + "," + dept2.F_DeptId + "," + dept3.F_DeptId + "," + dept4.F_DeptId 
+                    + "," + dept5.F_DeptId + "," + dept6.F_DeptId + "," + dept7.F_DeptId + "," + dept8.F_DeptId;
             }
             else if (ua.F_UserCode == "8012")
             {