修改bug

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

@@ -30,6 +30,7 @@ namespace CallCenterApi.Interface.Controllers
             {
                 string Key = RequestString.GetQueryString("Key");
                 int Id = RequestString.GetInt("Id", 0);
+                int RoleId = RequestString.GetInt("roleid", 0);
                 string strpageindex = RequestString.GetQueryString("page");
                 int pageindex = 1;
                 string strpagesize = RequestString.GetQueryString("pagesize");
@@ -37,13 +38,17 @@ namespace CallCenterApi.Interface.Controllers
 
                 if (Id > 0)
                 {
-                    sql += " and F_DeptId=" + Id;
+                    //sql += " and F_DeptId=" + Id;
+
+                    sql += " and F_DeptId in (" + GetDeptIds(Id) + ")";
+                }
+                if (RoleId > 0)
+                {
+                    sql += " and F_RoleId=" + RoleId;
                 }
                 if (!string.IsNullOrWhiteSpace(Key))
                 {
-                    sql = "";
-                    string str = string.Format(" and (F_UserCode like '%{0}%' or F_UserName like '%{1}%')", Key, Key);
-                    sql += str;
+                    sql += string.Format(" and (F_UserCode like '%{0}%' or F_UserName like '%{1}%')", Key, Key);
                 }
                 if (strpageindex.Trim() != "")
                 {
@@ -61,7 +66,7 @@ namespace CallCenterApi.Interface.Controllers
                                         "F_UserId",
                                         "*",
                                         sql,
-                                        "ORDER BY F_UserId desc",
+                                        "ORDER BY F_RoleId, F_UserCode desc",
                                         pagesize,
                                         pageindex,
                                         true,
@@ -119,6 +124,20 @@ namespace CallCenterApi.Interface.Controllers
             }
         }
 
+        //获取单位下所有单位id
+        public string GetDeptIds(int deptid = 0)
+        {
+            string ids = deptid.ToString();
+
+            var list = departmentBLL.GetModelList("F_State=0 and F_PartentId=" + deptid);
+            foreach (var l in list)
+            {
+                string childids = GetDeptIds(l.F_DeptId);
+                ids += "," + childids;
+            }
+
+            return ids;
+        }
 
         //获取用户信息
         [Authority]