【修改】工号字段处理,统一修改成username
This commit is contained in:
-2
@@ -644,8 +644,6 @@ public class SysUserController {
|
||||
if (message.contains(CommonConstant.SQL_INDEX_UNIQ_SYS_USER_USERNAME)
|
||||
|| message.contains(CommonConstant.SQL_INDEX_INDEX_USER_NAME)) {
|
||||
errorMessage.add("第 " + lineNumber + " 行:用户名已经存在,忽略导入。");
|
||||
} else if (message.contains(CommonConstant.SQL_INDEX_UNIQ_SYS_USER_WORK_NO)) {
|
||||
errorMessage.add("第 " + lineNumber + " 行:工号已经存在,忽略导入。");
|
||||
} else if (message.contains(CommonConstant.SQL_INDEX_UNIQ_SYS_USER_PHONE)) {
|
||||
errorMessage.add("第 " + lineNumber + " 行:手机号已经存在,忽略导入。");
|
||||
} else if (message.contains(CommonConstant.SQL_INDEX_UNIQ_SYS_USER_EMAIL)) {
|
||||
|
||||
+3
-3
@@ -116,8 +116,8 @@
|
||||
<if test="userParams.realname != null and userParams.realname != ''">
|
||||
AND sys_user.realname LIKE concat(concat('%',#{userParams.realname}),'%')
|
||||
</if>
|
||||
<if test="userParams.workNo != null and userParams.workNo != ''">
|
||||
AND sys_user.work_no LIKE concat(concat('%',#{userParams.workNo}),'%')
|
||||
<if test="userParams.username != null and userParams.username != ''">
|
||||
AND sys_user.username LIKE concat(concat('%',#{userParams.username}),'%')
|
||||
</if>
|
||||
</if>
|
||||
</sql>
|
||||
@@ -128,7 +128,7 @@
|
||||
sys_user.id AS id,
|
||||
sys_user.realname AS realname,
|
||||
sys_user.avatar AS avatar,
|
||||
sys_user.work_no AS workNo,
|
||||
sys_user.username AS username,
|
||||
sys_user.telephone AS telephone,
|
||||
sys_user.email AS email,
|
||||
sys_user.phone AS phone,
|
||||
|
||||
+1
-1
@@ -12,7 +12,7 @@ public class SysUserSysDepartModel {
|
||||
|
||||
private String id;
|
||||
private String realname;
|
||||
private String workNo;
|
||||
private String username;
|
||||
private String post;
|
||||
private String telephone;
|
||||
private String email;
|
||||
|
||||
Reference in New Issue
Block a user