Add user dto class

04.系统编码/App/Controllers/UserManagementController.cs

@@ -38,7 +38,7 @@ namespace Pingchuan.BeijingSafeguard.App.Controllers
         [HttpPost]
         public JsonResult Query(int orgId, int page, int rows)
         {
-            Pagination<User> users = UserBLL.Query(orgId, page, rows);
+            Pagination<UserDTO> users = UserBLL.Query(orgId, page, rows);
             return Json(users);
         }
     }

04.系统编码/BLL/UserBLL.cs

@@ -38,7 +38,7 @@ namespace Pingchuan.BeijingSafeguard.BLL
             return UserDAL.Delete(id);
         }
 
-        public static Pagination<User> Query(int orgId, int pageIndex, int pageSize)
+        public static Pagination<UserDTO> Query(int orgId, int pageIndex, int pageSize)
         {
             return UserDAL.Query(orgId, pageIndex, pageSize);
         }

04.系统编码/DAL/UserDAL.cs

@@ -44,12 +44,14 @@ namespace Pingchuan.BeijingSafeguard.DAL
             return db.Execute(sql);
         }
 
-        public static Pagination<User> Query(int orgId, int pageIndex, int pageSize)
+        public static Pagination<UserDTO> Query(int orgId, int pageIndex, int pageSize)
         {
             string condition = orgId == 0 ? string.Empty : $"where org_id = {orgId}";
-            string sql = $@"select * from users {condition} order by create_time desc";
-            Page<User> users = db.Page<User>(pageIndex, pageSize, sql);
-            return Pagination<User>.FromPage(users);
+            string sql = $@"select u.*, o.name org_name from users u {condition} 
+                            left join orgs o on o.id = u.org_id 
+                            order by u.create_time desc";
+            Page<UserDTO> users = db.Page<UserDTO>(pageIndex, pageSize, sql);
+            return Pagination<UserDTO>.FromPage(users);
         }
     }
 }

04.系统编码/Model/Model.csproj

@@ -56,6 +56,7 @@
     <Compile Include="Tag.cs" />
     <Compile Include="User.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="UserDTO.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Utility\Utility.csproj">

04.系统编码/Model/UserDTO.cs

@@ -0,0 +1,11 @@
+using System;
+using PetaPoco;
+
+namespace Pingchuan.BeijingSafeguard.Model
+{
+    public class UserDTO : User
+    {
+        [Column("org_name")]
+        public string OrgName { get; set; }
+    }
+}