From cdb2bcb00ee362815cfa932a2e45438d6bab2eec Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 09 七月 2024 16:00:57 +0800
Subject: [PATCH] 提交

---
 north-glass-erp/src/main/resources/mapper/userInfo/User.xml |   45 +++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/north-glass-erp/src/main/resources/mapper/userInfo/User.xml b/north-glass-erp/src/main/resources/mapper/userInfo/User.xml
index 5a0e5de..a27247d 100644
--- a/north-glass-erp/src/main/resources/mapper/userInfo/User.xml
+++ b/north-glass-erp/src/main/resources/mapper/userInfo/User.xml
@@ -3,10 +3,30 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.example.erp.mapper.userInfo.UserMapper">
-    <select id="findAll">
-        SELECT *
-        FROM erp_user_info.user
-        where state =1
+    <resultMap id="findAllMap" type="com.example.erp.entity.userInfo.User">
+        <id property="id" column="id"/>
+        <result property="loginName" column="login_name"/>
+        <result property="userName" column="user_name"/>
+        <result property="createTime" column="create_time"/>
+
+        <collection property="userRoleList" ofType="com.example.erp.entity.userInfo.UserRole">
+            <result property="userId" column="user_id"/>
+            <result property="roleId" column="role_id"/>
+            <result property="role" column="role"/>
+        </collection>
+    </resultMap>
+
+
+    <select id="findAll" resultMap="findAllMap">
+        SELECT a.*,
+        b.role_id,
+        c.role
+        FROM erp_user_info.user as a
+        left join user_role as b
+        on a.id = b.user_id
+        left join role as c
+        on b.role_id = c.id
+        where state =1 and a.id != 1
     </select>
 
     <select id="findOne" >
@@ -19,6 +39,12 @@
         SELECT *
         FROM erp_user_info.user
         where login_name=#{LoginName}
+    </select>
+
+    <select id="findOnePassWord" >
+        SELECT *
+        FROM erp_user_info.user
+        where id=#{id} and password=#{passWord}
     </select>
 
     <insert id="register"  useGeneratedKeys="true" keyProperty="id">
@@ -41,4 +67,15 @@
         where a.id = #{loginId}
 
     </select>
+    <update id="userDelete">
+        update user
+        set state =0
+        where id = #{id}
+    </update>
+
+    <update id="updatePassWordById">
+        update erp_user_info.user
+        set password=#{passWord},update_time=now()
+        where id=#{id}
+    </update>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0