|
|
|
@ -25,6 +25,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" |
|
|
|
<result property="updateTime" column="update_time" /> |
|
|
|
<result property="remark" column="remark" /> |
|
|
|
<result property="slaverAdmin" column="slaver_admin" /> |
|
|
|
<result property="tenantName" column="tenant_name" /> |
|
|
|
<result property="tenantPhone" column="tenant_phone" /> |
|
|
|
<association property="dept" javaType="SysDept" resultMap="deptResult" /> |
|
|
|
<collection property="roles" javaType="java.util.List" resultMap="RoleResult" /> |
|
|
|
</resultMap> |
|
|
|
@ -49,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" |
|
|
|
</resultMap> |
|
|
|
|
|
|
|
<sql id="selectUserVo"> |
|
|
|
select u.user_id, u.tenant_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, u.slaver_admin, |
|
|
|
select u.user_id, u.tenant_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, u.slaver_admin, u.tenant_name, u.tenant_phone, |
|
|
|
d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status, |
|
|
|
r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status |
|
|
|
from sys_user u |
|
|
|
@ -168,7 +170,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" |
|
|
|
<if test="status != null and status != ''">status,</if> |
|
|
|
<if test="createBy != null and createBy != ''">create_by,</if> |
|
|
|
<if test="remark != null and remark != ''">remark,</if> |
|
|
|
<if test="slaverAdmin != null">slaver_admin,</if> |
|
|
|
<if test="slaverAdmin != null">slaver_admin,</if> |
|
|
|
<if test="tenantName != null and tenantName != ''">tenant_name,</if> |
|
|
|
<if test="tenantPhone != null and tenantPhone != ''">tenant_phone,</if> |
|
|
|
create_time |
|
|
|
)values( |
|
|
|
<if test="userId != null and userId != ''">#{userId},</if> |
|
|
|
@ -184,7 +188,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" |
|
|
|
<if test="status != null and status != ''">#{status},</if> |
|
|
|
<if test="createBy != null and createBy != ''">#{createBy},</if> |
|
|
|
<if test="remark != null and remark != ''">#{remark},</if> |
|
|
|
<if test="slaverAdmin != null">#{slaverAdmin},</if> |
|
|
|
<if test="slaverAdmin != null">#{slaverAdmin},</if> |
|
|
|
<if test="tenantName != null and tenantName != ''">#{tenantName},</if> |
|
|
|
<if test="tenantPhone != null and tenantPhone != ''">#{tenantPhone},</if> |
|
|
|
sysdate() |
|
|
|
) |
|
|
|
</insert> |
|
|
|
|
zzc
3 months ago