用户信息变更
This commit is contained in:
@@ -611,12 +611,12 @@ public class SysUserServiceImpl implements SysUserService {
|
||||
filter.setEmail(email);
|
||||
filter.setDeleted(false);
|
||||
|
||||
if (StringUtils.hasText(excludeId)) {
|
||||
filter.setID(excludeId);
|
||||
}
|
||||
// if (StringUtils.hasText(excludeId)) {
|
||||
// filter.setID(excludeId);
|
||||
// }
|
||||
|
||||
long count = userMapper.selectByFilter(filter, userDeptRoles).size();
|
||||
boolean exists = count > 0;
|
||||
List<TbSysUser> userList = userMapper.selectByFilter(filter, userDeptRoles);
|
||||
boolean exists = userList.size() >1 && (userList.size() == 1 && !userList.get(0).getID().equals(excludeId));
|
||||
|
||||
logger.info("邮箱存在性检查完成:{},存在:{}", email, exists);
|
||||
resultDomain.success("检查完成", exists);
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
<result column="given_name" property="givenName" />
|
||||
<result column="full_name" property="fullName" />
|
||||
<result column="level" property="level" />
|
||||
<result column="student_id" property="studentId" />
|
||||
<result column="id_card" property="idCard" />
|
||||
<result column="address" property="address" />
|
||||
<result column="create_time" property="createTime" />
|
||||
@@ -19,7 +20,7 @@
|
||||
</resultMap>
|
||||
|
||||
<sql id="Base_Column_List">
|
||||
id, user_id, avatar, gender, family_name, given_name, full_name, level, id_card, address, create_time, update_time, delete_time, deleted
|
||||
id, user_id, avatar, gender, student_id, family_name, given_name, full_name, level, id_card, address, create_time, update_time, delete_time, deleted
|
||||
</sql>
|
||||
<!-- insertUserInfo -->
|
||||
|
||||
@@ -39,6 +40,7 @@
|
||||
<if test="userInfo.givenName != null">given_name = #{userInfo.givenName},</if>
|
||||
<if test="userInfo.fullName != null">full_name = #{userInfo.fullName},</if>
|
||||
<if test="userInfo.level != null">level = #{userInfo.level},</if>
|
||||
<if test="userInfo.studentId != null">student_id = #{userInfo.studentId},</if>
|
||||
<if test="userInfo.idCard != null">id_card = #{userInfo.idCard},</if>
|
||||
<if test="userInfo.address != null">address = #{userInfo.address},</if>
|
||||
<if test="userInfo.updater != null">updater = #{userInfo.updater},</if>
|
||||
|
||||
@@ -50,6 +50,7 @@
|
||||
<result column="dept_name" property="deptName" jdbcType="VARCHAR"/>
|
||||
<result column="role_name" property="roleName" jdbcType="VARCHAR"/>
|
||||
<result column="level" property="level" jdbcType="INTEGER"/>
|
||||
<result column="student_id" property="studentId" jdbcType="VARCHAR"/>
|
||||
<result column="id_card" property="idCard" jdbcType="VARCHAR"/>
|
||||
<result column="address" property="address" jdbcType="VARCHAR"/>
|
||||
<result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
|
||||
@@ -64,13 +65,13 @@
|
||||
</sql>
|
||||
|
||||
<sql id="FullUser_Column_List">
|
||||
id, user_id, avatar, gender, family_name, given_name, full_name, id_card, address,
|
||||
id, user_id, avatar, gender, family_name, given_name, full_name, student_id,id_card, address,
|
||||
create_time, update_time, delete_time, deleted, status
|
||||
</sql>
|
||||
|
||||
<!-- 用户信息字段 -->
|
||||
<sql id="UserInfo_Column_List">
|
||||
id, user_id, avatar, gender, family_name, given_name, full_name, id_card, address,
|
||||
id, user_id, avatar, gender, family_name, given_name, full_name, student_id,id_card, address,
|
||||
create_time, update_time, delete_time, deleted
|
||||
</sql>
|
||||
|
||||
@@ -230,6 +231,7 @@
|
||||
ui.given_name,
|
||||
ui.full_name,
|
||||
ui.level,
|
||||
ui.student_id,
|
||||
ui.id_card,
|
||||
ui.address,
|
||||
udr.dept_id,
|
||||
@@ -349,6 +351,7 @@
|
||||
ui.given_name,
|
||||
ui.full_name,
|
||||
ui.level,
|
||||
ui.student_id,
|
||||
ui.id_card,
|
||||
ui.address,
|
||||
udr.dept_id,
|
||||
@@ -491,6 +494,8 @@
|
||||
<if test="userInfo.familyName != null">family_name = #{userInfo.familyName},</if>
|
||||
<if test="userInfo.givenName != null">given_name = #{userInfo.givenName},</if>
|
||||
<if test="userInfo.fullName != null">full_name = #{userInfo.fullName},</if>
|
||||
<if test="userInfo.level != null">level = #{userInfo.level},</if>
|
||||
<if test="userInfo.studentId != null">student_id = #{userInfo.studentId},</if>
|
||||
<if test="userInfo.idCard != null">id_card = #{userInfo.idCard},</if>
|
||||
<if test="userInfo.address != null">address = #{userInfo.address},</if>
|
||||
<if test="userInfo.updateTime != null">update_time = #{userInfo.updateTime}</if>
|
||||
@@ -562,6 +567,7 @@
|
||||
tus.email,
|
||||
tsui.avatar,
|
||||
tsui.gender,
|
||||
tsui.student_id,
|
||||
(SELECT dept_path FROM dept_hierarchy WHERE parent_id IS NULL LIMIT 1) as dept_name,
|
||||
tsr.name as role_name,
|
||||
tsui.level,
|
||||
|
||||
Reference in New Issue
Block a user