@ -32,8 +32,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property= "politics" column= "politics" />
<result property= "politics" column= "politics" />
<result property= "shemichengdu" column= "shemichengdu" />
<result property= "shemichengdu" column= "shemichengdu" />
<result property= "graduate" column= "graduate" />
<result property= "graduate" column= "graduate" />
<result property= "startdat a" column= "startdata " />
<result property= "startdat e" column= "startdate " />
<result property= "enddat a" column= "enddata " />
<result property= "enddat e" column= "enddate " />
<result property= "helthy" column= "helthy" />
<result property= "helthy" column= "helthy" />
<association property= "dept" column= "dept_id" javaType= "SysDept" resultMap= "deptResult" />
<association property= "dept" column= "dept_id" javaType= "SysDept" resultMap= "deptResult" />
<collection property= "roles" javaType= "java.util.List" resultMap= "RoleResult" />
<collection property= "roles" javaType= "java.util.List" resultMap= "RoleResult" />
@ -59,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
</resultMap>
<sql id= "selectUserVo" >
<sql id= "selectUserVo" >
select u.user_id, u.dept_id, u.login_name, u.user_name, u.user_type, u.email, u.avatar, u.phonenumber, u.sex, u.password, u.salt, u.status, u.del_flag, u.login_ip, u.login_date, u.pwd_update_date, u.create_time, u.remark,userarea, nation, birthday, politics, shemichengdu, graduate, startdata, enddata , helthy,
select u.user_id, u.dept_id, u.login_name, u.user_name, u.user_type, u.email, u.avatar, u.phonenumber, u.sex, u.password, u.salt, u.status, u.del_flag, u.login_ip, u.login_date, u.pwd_update_date, u.create_time, u.remark,userarea, nation, birthday, politics, shemichengdu, graduate, startdate, enddate , helthy,
d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
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
r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
from sys_user u
from sys_user u
@ -69,7 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</sql>
</sql>
<select id= "selectUserList" parameterType= "SysUser" resultMap= "SysUserResult" >
<select id= "selectUserList" parameterType= "SysUser" resultMap= "SysUserResult" >
select u.user_id, u.dept_id, u.login_name, u.user_name, u.user_type, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.salt, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, userarea, nation, birthday, politics, shemichengdu, graduate, startdata, enddata , helthy,d.dept_name, d.leader from sys_user u
select u.user_id, u.dept_id, u.login_name, u.user_name, u.user_type, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.salt, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, userarea, nation, birthday, politics, shemichengdu, graduate, startdate, enddate , helthy,d.dept_name, d.leader from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
left join sys_dept d on u.dept_id = d.dept_id
where u.del_flag = '0'
where u.del_flag = '0'
<if test= "userId != null and userId != 0" >
<if test= "userId != null and userId != 0" >
@ -98,7 +98,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
</select>
<select id= "selectAllocatedList" parameterType= "SysUser" resultMap= "SysUserResult" >
<select id= "selectAllocatedList" parameterType= "SysUser" resultMap= "SysUserResult" >
select distinct u.user_id, u.dept_id, u.login_name, u.user_name, u.user_type, u.email, u.avatar, u.phonenumber, u.status, u.create_time,userarea, nation, birthday, politics, shemichengdu, graduate, startdata, enddata , helthy
select distinct u.user_id, u.dept_id, u.login_name, u.user_name, u.user_type, u.email, u.avatar, u.phonenumber, u.status, u.create_time,userarea, nation, birthday, politics, shemichengdu, graduate, startdate, enddate , helthy
from sys_user u
from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
left join sys_dept d on u.dept_id = d.dept_id
left join sys_user_role ur on u.user_id = ur.user_id
left join sys_user_role ur on u.user_id = ur.user_id
@ -115,7 +115,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
</select>
<select id= "selectUnallocatedList" parameterType= "SysUser" resultMap= "SysUserResult" >
<select id= "selectUnallocatedList" parameterType= "SysUser" resultMap= "SysUserResult" >
select distinct u.user_id, u.dept_id, u.login_name, u.user_name, u.user_type, u.email, u.avatar, u.phonenumber, u.status, u.create_time,userarea, nation, birthday, politics, shemichengdu, graduate, startdata, enddata , helthy
select distinct u.user_id, u.dept_id, u.login_name, u.user_name, u.user_type, u.email, u.avatar, u.phonenumber, u.status, u.create_time,userarea, nation, birthday, politics, shemichengdu, graduate, startdate, enddate , helthy
from sys_user u
from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
left join sys_dept d on u.dept_id = d.dept_id
left join sys_user_role ur on u.user_id = ur.user_id
left join sys_user_role ur on u.user_id = ur.user_id
@ -253,8 +253,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test= "politics != null" > #{politics},</if>
<if test= "politics != null" > #{politics},</if>
<if test= "shemichengdu != null" > #{shemichengdu},</if>
<if test= "shemichengdu != null" > #{shemichengdu},</if>
<if test= "graduate != null" > #{graduate},</if>
<if test= "graduate != null" > #{graduate},</if>
<if test= "startdat a != null"> #{startdata },</if>
<if test= "startdat e != null"> #{startdate },</if>
<if test= "enddat a != null"> #{enddata },</if>
<if test= "enddat e != null"> #{enddate },</if>
<if test= "helthy != null" > #{helthy},</if>
<if test= "helthy != null" > #{helthy},</if>
sysdate()
sysdate()
)
)