调整数据结构

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/information/NoticeController.cs

@@ -53,25 +53,26 @@ namespace CallCenterApi.Interface.Controllers.information
         /// <returns></returns>
         public ActionResult GetRoleUsersList()
         {
-            DataTable dt = new DataTable();
+            DataTable dtuser = new DataTable();
+            var sql = " F_DeleteFlag=0  ";
+            string sqldt = "SELECT F_UserId as F_Id,('('+F_UserCode+')'+F_UserName)as F_Name,F_RoleId as F_Pid FROM T_Sys_UserAccount WHERE " + sql + " ";
+            dtuser = DbHelperSQL.Query(sqldt).Tables[0];
 
-            List<Model.T_Sys_RoleInfo> rolelist = rolebll.GetModelList("");
+            DataTable dtrole = new DataTable();
+            dtrole = rolebll.GetAllList().Tables[0];
 
-            var newlist = rolelist.Select(rl =>
+            DataTable newdt = new DataTable();
+            newdt = dtuser;
+            for (int i = 0; i < dtrole.Rows.Count; i++)
             {
-                var sql = " F_DeleteFlag=0 and F_RoleId="+ rl.F_RoleId + " ";
-                string sqldt = "SELECT F_UserId as F_Id,('('+F_UserCode+')'+F_UserName)as F_Name,F_RoleId as F_Pid FROM T_Sys_UserAccount WHERE " + sql + " ";
-                dt = DbHelperSQL.Query(sqldt).Tables[0];
-                return new
-                {
-                    F_Id= rl.F_RoleId,
-                    F_Name = rl.F_RoleName,
-                    F_Pid = 0,
-                    userlists = dt
-                };
-            });
+                DataRow drnew = newdt.NewRow();
+                drnew["F_Id"] = dtrole.Rows[i]["F_RoleId"];
+                drnew["F_Name"] = dtrole.Rows[i]["F_RoleName"];
+                drnew["F_Pid"] = 0;
+                newdt.Rows.Add(drnew);
+            }
 
-            return Success("获取成功", newlist);
+            return Success("获取成功", newdt);
         }
 
         // 获取公告列表