From b1b44f21dc42d80cd25acccdc279edf3b6ad19d3 Mon Sep 17 00:00:00 2001 From: zer0Black <694429613@qq.com> Date: Sat, 30 Sep 2023 16:43:33 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E5=B7=A5?= =?UTF-8?q?=E5=8F=B7=E5=AD=97=E6=AE=B5=E5=A4=84=E7=90=86=EF=BC=8C=E7=BB=9F?= =?UTF-8?q?=E4=B8=80=E4=BF=AE=E6=94=B9=E6=88=90username?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/jero/common/constant/CommonConstant.java | 2 -- .../jero/modules/system/controller/SysUserController.java | 2 -- .../com/jero/modules/system/mapper/xml/SysUserMapper.xml | 6 +++--- .../jero/modules/system/model/SysUserSysDepartModel.java | 2 +- .../mapper/xml/EnterpriseStandardDeclareMapper.xml | 2 +- .../enterprise/mapper/xml/EnterpriseStandardPlanMapper.xml | 2 +- .../xml/EnterpriseStandardReviewMeetingRecordMapper.xml | 6 +++--- 7 files changed, 9 insertions(+), 13 deletions(-) diff --git a/laws-base/laws-base-core/src/main/java/com/jero/common/constant/CommonConstant.java b/laws-base/laws-base-core/src/main/java/com/jero/common/constant/CommonConstant.java index de6b7b8c..4bbf5599 100644 --- a/laws-base/laws-base-core/src/main/java/com/jero/common/constant/CommonConstant.java +++ b/laws-base/laws-base-core/src/main/java/com/jero/common/constant/CommonConstant.java @@ -233,8 +233,6 @@ public class CommonConstant { public static final String SQL_INDEX_INDEX_USER_NAME = "index_user_name"; /** sys_user 表 username 唯一键索引 */ public static final String SQL_INDEX_UNIQ_SYS_USER_USERNAME = "uniq_sys_user_username"; - /** sys_user 表 work_no 唯一键索引 */ - public static final String SQL_INDEX_UNIQ_SYS_USER_WORK_NO = "uniq_sys_user_work_no"; /** sys_user 表 phone 唯一键索引 */ public static final String SQL_INDEX_UNIQ_SYS_USER_PHONE = "uniq_sys_user_phone"; /** sys_user 表 email 唯一键索引 */ diff --git a/laws-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java b/laws-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java index 1326335c..08fdfd16 100644 --- a/laws-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java +++ b/laws-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java @@ -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)) { diff --git a/laws-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml b/laws-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml index 8c373046..5ef8e349 100644 --- a/laws-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml +++ b/laws-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml @@ -116,8 +116,8 @@ AND sys_user.realname LIKE concat(concat('%',#{userParams.realname}),'%') - - AND sys_user.work_no LIKE concat(concat('%',#{userParams.workNo}),'%') + + AND sys_user.username LIKE concat(concat('%',#{userParams.username}),'%') @@ -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, diff --git a/laws-module-system/src/main/java/com/jero/modules/system/model/SysUserSysDepartModel.java b/laws-module-system/src/main/java/com/jero/modules/system/model/SysUserSysDepartModel.java index f075e392..b59c20e5 100644 --- a/laws-module-system/src/main/java/com/jero/modules/system/model/SysUserSysDepartModel.java +++ b/laws-module-system/src/main/java/com/jero/modules/system/model/SysUserSysDepartModel.java @@ -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; diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardDeclareMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardDeclareMapper.xml index 36892605..4ef90cc4 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardDeclareMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardDeclareMapper.xml @@ -37,7 +37,7 @@ s.implementation_date, d.declare_date, d.declare_user, - CONCAT(u.username, '（', u.work_no, '）') AS declareUserName, + CONCAT(u.realname, '（', u.username, '）') AS declareUserName, d.declare_file, f.file_name AS declareFileName FROM diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardPlanMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardPlanMapper.xml index 0633a2a5..4b46056c 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardPlanMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardPlanMapper.xml @@ -164,7 +164,7 @@ - AND u3.work_no LIKE CONCAT('%',#{param.standardPromoterWorkNo},'%') + AND u3.username LIKE CONCAT('%',#{param.standardPromoterWorkNo},'%') diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardReviewMeetingRecordMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardReviewMeetingRecordMapper.xml index 4ac606d4..272e2b3b 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardReviewMeetingRecordMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardReviewMeetingRecordMapper.xml @@ -27,7 +27,7 @@ esp.qualityFlag, (score.avg_score_item1 + score.avg_score_item2 + score.avg_score_item3 + score.avg_score_item4 + score.avg_score_item5 + score.avg_score_item6) AS avgScore, - GROUP_CONCAT(DISTINCT CONCAT(u.username, '（', u.work_no, '）') ORDER BY u.username ASC SEPARATOR '，') AS reviewUsers + GROUP_CONCAT(DISTINCT CONCAT(u.realname, '（', u.username, '）') ORDER BY u.username ASC SEPARATOR '，') AS reviewUsers FROM `laws_enterprise_standard_review_meeting_record` AS rmr LEFT JOIN @@ -140,7 +140,7 @@ SELECT - CONCAT(u.username, '（', u.work_no, '）') AS adjudicatorName, + CONCAT(u.realname, '（', u.username, '）') AS adjudicatorName, d.evaluate_item, d.evaluate_score, d.deduction_score_reason