<<<<<<< HEAD ======= >>>>>>> 93181b5fbb436385d1d312300e8dcc61b43d1666 <<<<<<< HEAD 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, >>>>>>> 93181b5fbb436385d1d312300e8dcc61b43d1666 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 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_role r on r.role_id = ur.role_id select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u left join sys_dept d on u.dept_id = d.dept_id where u.del_flag = '0' AND u.user_id = #{userId} AND u.user_name like concat('%', #{userName}, '%') AND u.status = #{status} AND u.phonenumber like concat('%', #{phonenumber}, '%') AND date_format(u.create_time,'%Y%m%d') >= date_format(#{params.beginTime},'%Y%m%d') AND date_format(u.create_time,'%Y%m%d') <= date_format(#{params.endTime},'%Y%m%d') AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors) )) ${params.dataScope} select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time from sys_user u 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_role r on r.role_id = ur.role_id where u.del_flag = '0' and r.role_id = #{roleId} AND u.user_name like concat('%', #{userName}, '%') AND u.phonenumber like concat('%', #{phonenumber}, '%') ${params.dataScope} select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time from sys_user u 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_role r on r.role_id = ur.role_id where u.del_flag = '0' and (r.role_id != #{roleId} or r.role_id IS NULL) and u.user_id not in (select u.user_id from sys_user u inner join sys_user_role ur on u.user_id = ur.user_id and ur.role_id = #{roleId}) AND u.user_name like concat('%', #{userName}, '%') AND u.phonenumber like concat('%', #{phonenumber}, '%') ${params.dataScope} where u.user_name = #{userName} and u.del_flag = '0' where u.user_id = #{userId} where u.user_name = #{userName} and u.tenant_id = #{tenantId} select user_id, user_name from sys_user where user_name = #{userName} and del_flag = '0' limit 1 select user_id, phonenumber from sys_user where phonenumber = #{phonenumber} and del_flag = '0' limit 1 select user_id, email from sys_user where email = #{email} and del_flag = '0' limit 1 insert into sys_user( user_id, dept_id, tenant_id, user_name, nick_name, email, avatar, phonenumber, sex, password, status, create_by, remark, <<<<<<< HEAD <<<<<<< HEAD slaver_admin, ======= slaver_admin, tenant_name, tenant_phone, >>>>>>> 93181b5fbb436385d1d312300e8dcc61b43d1666 ======= slaver_admin, >>>>>>> new create_time )values( #{userId}, #{deptId}, #{tenantId}, #{userName}, #{nickName}, #{email}, #{avatar}, #{phonenumber}, #{sex}, #{password}, #{status}, #{createBy}, #{remark}, <<<<<<< HEAD <<<<<<< HEAD #{slaverAdmin}, ======= #{slaverAdmin}, #{tenantName}, #{tenantPhone}, >>>>>>> 93181b5fbb436385d1d312300e8dcc61b43d1666 ======= #{slaverAdmin}, >>>>>>> new sysdate() ) update sys_user tenant_id = #{tenantId}, slaver_admin = #{slaverAdmin}, dept_id = #{deptId}, user_name = #{userName}, nick_name = #{nickName}, email = #{email}, phonenumber = #{phonenumber}, sex = #{sex}, avatar = #{avatar}, password = #{password}, status = #{status}, login_ip = #{loginIp}, login_date = #{loginDate}, update_by = #{updateBy}, remark = #{remark}, slaver_admin = #{slaverAdmin}, update_time = sysdate() where user_id = #{userId} update sys_user set status = #{status} where user_id = #{userId} update sys_user set avatar = #{avatar} where user_name = #{userName} update sys_user set password = #{password} where user_name = #{userName} update sys_user set del_flag = '2' where user_id = #{userId} update sys_user set del_flag = '2' where user_id in #{userId}