From 8f8ba3c62d6fc9f4733a408daf59a5badd82e5e2 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 26 八月 2023 11:42:26 +0800
Subject: [PATCH] 开发8-25人员管理与组织架构对接完成

---
 user-server/src/main/resources/mapper/UserMapper.xml |   18 ++++--------------
 1 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/user-server/src/main/resources/mapper/UserMapper.xml b/user-server/src/main/resources/mapper/UserMapper.xml
index 98d4d25..039f57c 100644
--- a/user-server/src/main/resources/mapper/UserMapper.xml
+++ b/user-server/src/main/resources/mapper/UserMapper.xml
@@ -17,20 +17,10 @@
           AND u.id = #{userId}
     </select>
 
-    <resultMap id="PagePersonnelVoMap" type="com.yuanchu.limslaboratory.pojo.vo.PagePersonnelVo">
-        <result property="id" column="id"/>
-        <result property="username" column="username"/>
-        <result property="roleName" column="roleName"/>
-        <result property="createTime" column="create_time"/>
-        <result property="age" column="age"/>
-        <result property="phone" column="phone"/>
-        <result property="email" column="email"/>
-        <result property="jobState" column="job_state"/>
-        <result property="department" column="department"/>
-    </resultMap>
-    <select id="getNewPersonnelPage" resultMap="PagePersonnelVoMap">
-        SELECT u.`id`, u.`name` username, r.`name` roleName, u.`create_time`, u.`age`,
-        u.`phone`, u.`email`, u.`job_state`, o.`department`
+
+    <select id="getNewPersonnelPage" resultType="map">
+        SELECT u.`id`, u.`name` username, r.`name` roleName, DATE_FORMAT(u.`create_time`, '%Y-%m-%d') createTime, u.`age`,
+        u.`phone`, u.`email`, u.`job_state` jobState, o.`department`, u.`account`, o.`id` departmentId
         FROM `user` u
         LEFT JOIN role r
         ON u.`role_id` = r.`id` AND r.`state` = 1

--
Gitblit v1.9.3