From 17efddc6a667670dca682bf36b51a43e99615e6d Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 16 十月 2024 15:59:38 +0800
Subject: [PATCH] 代码初始化
---
server/system_service/src/main/resources/mappers/SystemUserMapper.xml | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/server/system_service/src/main/resources/mappers/SystemUserMapper.xml b/server/system_service/src/main/resources/mappers/SystemUserMapper.xml
index 78d68d6..62eb9c4 100644
--- a/server/system_service/src/main/resources/mappers/SystemUserMapper.xml
+++ b/server/system_service/src/main/resources/mappers/SystemUserMapper.xml
@@ -5,10 +5,10 @@
<!-- 鏌ヨ鐢ㄦ埛鍒楄〃 -->
<resultMap id="SystemUserListVO" type="com.doumee.dao.system.vo.SystemUserListVO" autoMapping="true">
<id column="ID" property="id"/>
- <association property="department" javaType="com.doumee.dao.system.model.SystemDepartment">
+ <!-- <association property="department" javaType="com.doumee.dao.system.model.SystemDepartment">
<result column="DEPARTMENT_ID" property="id"/>
<result column="DEPARTMENT_NAME" property="name"/>
- </association>
+ </association>-->
<association property="createUserInfo" javaType="com.doumee.dao.system.model.SystemUser">
<result column="CREATE_USER_ID" property="id"/>
<result column="CREATE_USER_NAME" property="username"/>
@@ -26,27 +26,27 @@
usr.ID, usr.BIRTHDAY, usr.EMAIL, usr.EMP_NO, usr.MOBILE, usr.AVATAR, usr.USERNAME, usr.REALNAME, usr.SEX, usr.FIXED, usr.CREATE_TIME, usr.UPDATE_TIME,
sd.ID AS DEPARTMENT_ID, sd.`NAME` AS DEPARTMENT_NAME,usr.wechat_name,usr.status,usr.OPENID,usr.type,
create_user.ID CREATE_USER_ID, create_user.`USERNAME` CREATE_USER_NAME, create_user.`REALNAME` CREATE_REAL_NAME,
- update_user.ID UPDETE_USER_ID, update_user.`USERNAME` UPDATE_USER_NAME, create_user.`REALNAME` UPDATE_REAL_NAME
+ update_user.ID UPDETE_USER_ID, update_user.`USERNAME` UPDATE_USER_NAME, create_user.`REALNAME` UPDATE_REAL_NAME,
+ sd.name as companyName
FROM `SYSTEM_USER` usr
LEFT JOIN `SYSTEM_USER` create_user ON create_user.ID = usr.CREATE_USER
LEFT JOIN `SYSTEM_USER` update_user ON update_user.ID = usr.UPDATE_USER
--- LEFT JOIN `SYSTEM_POSITION_USER` spu ON spu.USER_ID = usr.ID AND spu.DELETED = 0
--- LEFT JOIN `SYSTEM_POSITION` sp ON sp.ID = spu.POSITION_ID AND sp.DELETED = 0
- LEFT JOIN `SYSTEM_DEPARTMENT_USER` sdu ON sdu.USER_ID = usr.ID AND sdu.DELETED = 0
- LEFT JOIN `SYSTEM_DEPARTMENT` sd ON sd.ID = sdu.DEPARTMENT_ID AND sd.DELETED = 0
+ LEFT JOIN `company` sd ON sd.ID = usr.COMPANY_ID AND sd.ISDELETED = 0
+ LEFT JOIN `member` m ON usr.MEMBER_ID = m.id
<if test="dto.roleId != null">
RIGHT JOIN system_user_role sur on sur.USER_ID = usr.ID and sur.ROLE_ID = #{dto.roleId}
</if>
<where>
usr.DELETED = 0
+ and usr.SOURCE = 0
<!-- <if test="dto.positionId != null">-->
<!-- AND spu.POSITION_ID = #{dto.positionId}-->
<!-- </if>-->
<if test="dto.strictDeptId != null">
- AND sdu.DEPARTMENT_ID = #{dto.strictDeptId}
+ AND sd.ID = #{dto.strictDeptId}
</if>
<if test="dto.departmentIds != null and dto.departmentIds.size > 0">
- AND sdu.DEPARTMENT_ID IN
+ AND sd.ID IN
<foreach collection="dto.departmentIds" open="(" close=")" separator="," item="id">
#{id}
</foreach>
@@ -63,6 +63,12 @@
<if test="dto.status != null ">
AND usr.`status` = #{dto.status}
</if>
+ <if test="dto.memberType != null ">
+ AND m.`type` = #{dto.memberType}
+ </if>
+ <if test="dto.companyType != null ">
+ AND sd.`type` = #{dto.companyType}
+ </if>
</where>
${orderByClause}
</select>
--
Gitblit v1.9.3