From a5b842f1f6ab32f1af39f4bcb7e45217e94db761 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期六, 25 十月 2025 18:14:44 +0800
Subject: [PATCH] fix:完成任务状态，任务同步，高度同步等工作
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 62 +++++++++++++++++++++++++++++++
1 files changed, 62 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index 0aa82fb..2687fab 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -117,6 +117,18 @@
}
/**
+ * 閫氳繃鎵嬫満鍙锋煡璇㈢敤鎴�
+ *
+ * @param phonenumber 鎵嬫満鍙�
+ * @return 鐢ㄦ埛瀵硅薄淇℃伅
+ */
+ @Override
+ public SysUser selectUserByPhonenumber(String phonenumber)
+ {
+ return userMapper.checkPhoneUnique(phonenumber);
+ }
+
+ /**
* 閫氳繃鐢ㄦ埛ID鏌ヨ鐢ㄦ埛
*
* @param userId 鐢ㄦ埛ID
@@ -503,6 +515,31 @@
{
BeanValidators.validateWithException(validator, user);
deptService.checkDeptDataScope(user.getDeptId());
+
+ // 鏍￠獙鎵嬫満鍙峰敮涓�鎬�
+ if (StringUtils.isNotEmpty(user.getPhonenumber()))
+ {
+ SysUser phoneCheck = userMapper.checkPhoneUnique(user.getPhonenumber());
+ if (StringUtils.isNotNull(phoneCheck))
+ {
+ failureNum++;
+ failureMsg.append("<br/>" + failureNum + "銆佽处鍙� " + user.getUserName() + " 瀵煎叆澶辫触锛氭墜鏈哄彿鐮� " + user.getPhonenumber() + " 宸茶鐢ㄦ埛 " + phoneCheck.getUserName() + " 浣跨敤");
+ continue;
+ }
+ }
+
+ // 鏍￠獙閭鍞竴鎬�
+ if (StringUtils.isNotEmpty(user.getEmail()))
+ {
+ SysUser emailCheck = userMapper.checkEmailUnique(user.getEmail());
+ if (StringUtils.isNotNull(emailCheck))
+ {
+ failureNum++;
+ failureMsg.append("<br/>" + failureNum + "銆佽处鍙� " + user.getUserName() + " 瀵煎叆澶辫触锛氶偖绠� " + user.getEmail() + " 宸茶鐢ㄦ埛 " + emailCheck.getUserName() + " 浣跨敤");
+ continue;
+ }
+ }
+
String password = configService.selectConfigByKey("sys.user.initPassword");
user.setPassword(SecurityUtils.encryptPassword(password));
user.setCreateBy(operName);
@@ -516,6 +553,31 @@
checkUserAllowed(u);
checkUserDataScope(u.getUserId());
deptService.checkDeptDataScope(user.getDeptId());
+
+ // 鏍￠獙鎵嬫満鍙峰敮涓�鎬э紙鎺掗櫎鑷繁锛�
+ if (StringUtils.isNotEmpty(user.getPhonenumber()))
+ {
+ SysUser phoneCheck = userMapper.checkPhoneUnique(user.getPhonenumber());
+ if (StringUtils.isNotNull(phoneCheck) && !phoneCheck.getUserId().equals(u.getUserId()))
+ {
+ failureNum++;
+ failureMsg.append("<br/>" + failureNum + "銆佽处鍙� " + user.getUserName() + " 鏇存柊澶辫触锛氭墜鏈哄彿鐮� " + user.getPhonenumber() + " 宸茶鐢ㄦ埛 " + phoneCheck.getUserName() + " 浣跨敤");
+ continue;
+ }
+ }
+
+ // 鏍￠獙閭鍞竴鎬э紙鎺掗櫎鑷繁锛�
+ if (StringUtils.isNotEmpty(user.getEmail()))
+ {
+ SysUser emailCheck = userMapper.checkEmailUnique(user.getEmail());
+ if (StringUtils.isNotNull(emailCheck) && !emailCheck.getUserId().equals(u.getUserId()))
+ {
+ failureNum++;
+ failureMsg.append("<br/>" + failureNum + "銆佽处鍙� " + user.getUserName() + " 鏇存柊澶辫触锛氶偖绠� " + user.getEmail() + " 宸茶鐢ㄦ埛 " + emailCheck.getUserName() + " 浣跨敤");
+ continue;
+ }
+ }
+
user.setUserId(u.getUserId());
user.setUpdateBy(operName);
userMapper.updateUser(user);
--
Gitblit v1.9.1