fix: 新增用户邮箱重复报错提示

dataease · fit2cloud-chenyw · Sep 10, 2021 · Sep 10, 2021 · Sep 10, 2021 · be1c979d472824a4f8fbd596f960d53950c5bd0a
commit be1c979d472824a4f8fbd596f960d53950c5bd0a
diff --git a/.gitignore b/.gitignore
@@ -40,6 +40,7 @@ yarn-error.log*
 pnpm-debug.log*
 
 # Editor directories and files
+.lh
 .idea
 .vscode
 *.suo

diff --git a/backend/src/main/java/io/dataease/service/sys/SysUserService.java b/backend/src/main/java/io/dataease/service/sys/SysUserService.java
@@ -80,6 +80,7 @@ public List<SysUserGridResponse> query(BaseGridRequest request) {
     @Transactional
     public int save(SysUserCreateRequest request) {
         checkUsername(request);
+        checkEmail(request);
         SysUser user = BeanUtils.copyBean(new SysUser(), request);
         long now = System.currentTimeMillis();
         user.setCreateTime(now);
@@ -109,6 +110,7 @@ public int save(SysUserCreateRequest request) {
     @Transactional
     public int update(SysUserCreateRequest request) {
         checkUsername(request);
+        checkEmail(request);
         if (StringUtils.isEmpty(request.getPassword())) {
             request.setPassword(null);
         }
@@ -251,4 +253,19 @@ private void checkUsername(SysUserCreateRequest request) {
             throw new RuntimeException(Translator.get("i18n_username_exists"));
         }
     }
+
+    private void checkEmail(SysUserCreateRequest request) {
+        SysUserExample sysUserExample = new SysUserExample();
+        SysUserExample.Criteria criteria = sysUserExample.createCriteria();
+        if (request.getUserId() != null) {
+            criteria.andUserIdNotEqualTo(request.getUserId());
+        }
+        criteria.andEmailEqualTo(request.getEmail());
+        List<SysUser> sysUsers = sysUserMapper.selectByExample(sysUserExample);
+        if (CollectionUtils.isNotEmpty(sysUsers)) {
+            throw new RuntimeException(Translator.get("i18n_email_exists"));
+        }
+    }
+
+
 }
diff --git a/backend/src/main/resources/i18n/messages_en_US.properties b/backend/src/main/resources/i18n/messages_en_US.properties
@@ -242,6 +242,7 @@ i18n_union_field_exists=The same field can't in two dataset
 i18n_cron_time_error=Start time can't greater then end time
 i18n_auth_source_be_canceled=This Auth Resource Already Be Canceled,Please Connect Admin
 i18n_username_exists=ID is already exists
+i18n_email_exists=Email is already exists
 i18n_ds_name_exists=Datasource name used
 i18n_sync_job_exists=There is already a synchronization task running, please try again later
 i18n_datasource_check_fail=Invalid,please check config

diff --git a/backend/src/main/resources/i18n/messages_zh_CN.properties b/backend/src/main/resources/i18n/messages_zh_CN.properties
@@ -241,6 +241,7 @@ i18n_union_field_exists=两个数据集之间关联不能出现多次相同字
 i18n_cron_time_error=开始时间不能大于结束时间
 i18n_auth_source_be_canceled=本用户当前资源所有授权权限已经被取消,如需再次开通,请联系管理员
 i18n_username_exists=用户 ID 已存在
+i18n_email_exists=邮箱已存在
 i18n_ds_name_exists=数据源名称已被使用
 i18n_sync_job_exists=已经有同步任务在运行，稍后重试
 i18n_datasource_check_fail=校验失败，请检查配置信息

diff --git a/backend/src/main/resources/i18n/messages_zh_TW.properties b/backend/src/main/resources/i18n/messages_zh_TW.properties
@@ -244,6 +244,7 @@ i18n_union_field_exists=兩個數據集之間關聯不能出現多次相同字
 i18n_cron_time_error=開始時間不能大於結束時間
 i18n_auth_source_be_canceled=本用户当前资源所有授权权限已经被取消,如需再次开通,请联系管理员
 i18n_username_exists=用戶ID已存在
+i18n_email_exists=郵箱已存在
 i18n_ds_name_exists=數據源名稱已被使用
 i18n_sync_job_exists=已經有同步任務在運行，稍後重試
 i18n_datasource_check_fail=校驗失敗，請檢查配置信息
-Original file line number
+Diff line change
@@ Expand Up / @@ -40,6 +40,7 @@ yarn-error.log* @@
     pnpm-debug.log*
     # Editor directories and files
+    .lh
     .idea
     .vscode
     *.suo
@@ Expand Down @@