From 44ee58a99afe19ba5ae962200f2bebab8da4618b Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 07 五月 2024 15:33:06 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/target/classes/mapper/userInfo/User.xml | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/north-glass-erp/target/classes/mapper/userInfo/User.xml b/north-glass-erp/target/classes/mapper/userInfo/User.xml
index 38454fc..1120d54 100644
--- a/north-glass-erp/target/classes/mapper/userInfo/User.xml
+++ b/north-glass-erp/target/classes/mapper/userInfo/User.xml
@@ -3,9 +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
+ <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" >
@@ -40,4 +61,9 @@
where a.id = #{loginId}
</select>
+ <update id="userDelete">
+ update user
+ set state =0
+ where id = #{id}
+ </update>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0