From 656d6f8029f8bf9b2daa9dcc89101a879a70b860 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期三, 03 十二月 2025 23:10:05 +0800
Subject: [PATCH] feat:优先添加执行人
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserSyncServiceImpl.java | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserSyncServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserSyncServiceImpl.java
index 44e8fa9..ecadd20 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserSyncServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserSyncServiceImpl.java
@@ -200,7 +200,17 @@
if (StringUtils.isNotEmpty(dto.getPhonenumber()))
{
- existingUser.setPhonenumber(dto.getPhonenumber());
+ // 鏍￠獙鎵嬫満鍙锋槸鍚﹀凡琚叾浠栫敤鎴蜂娇鐢紙鎺掗櫎鑷繁锛�
+ SysUser phoneCheck = sysUserMapper.checkPhoneUnique(dto.getPhonenumber());
+ if (StringUtils.isNotNull(phoneCheck) && !phoneCheck.getUserId().equals(existingUser.getUserId()))
+ {
+ log.warn("鏇存柊鐢ㄦ埛 {} 澶辫触锛屾墜鏈哄彿 {} 宸茶鐢ㄦ埛 {} 浣跨敤锛岃烦杩囨墜鏈哄彿鏇存柊",
+ existingUser.getUserName(), dto.getPhonenumber(), phoneCheck.getUserName());
+ }
+ else
+ {
+ existingUser.setPhonenumber(dto.getPhonenumber());
+ }
}
if (StringUtils.isNotEmpty(dto.getSex()))
@@ -209,6 +219,10 @@
}
existingUser.setUpdateBy("sync");
+ if (StringUtils.isNotEmpty(dto.getOaOrderClass()))
+ {
+ existingUser.setOaOrderClass(dto.getOaOrderClass());
+ }
sysUserMapper.updateUser(existingUser);
}
@@ -221,6 +235,10 @@
newUser.setUserName(dto.getUserName());
newUser.setNickName(dto.getNickName());
newUser.setOaUserId(dto.getOaUserId());
+ if (StringUtils.isNotEmpty(dto.getOaOrderClass()))
+ {
+ newUser.setOaOrderClass(dto.getOaOrderClass());
+ }
if (deptId != null)
{
@@ -239,6 +257,14 @@
if (StringUtils.isNotEmpty(dto.getPhonenumber()))
{
+ // 鏍￠獙鎵嬫満鍙锋槸鍚﹀凡琚叾浠栫敤鎴蜂娇鐢�
+ SysUser phoneCheck = sysUserMapper.checkPhoneUnique(dto.getPhonenumber());
+ if (StringUtils.isNotNull(phoneCheck))
+ {
+ log.warn("鍒涘缓鐢ㄦ埛澶辫触锛屾墜鏈哄彿 {} 宸茶鐢ㄦ埛 {} 浣跨敤锛岃烦杩囩敤鎴� {}",
+ dto.getPhonenumber(), phoneCheck.getUserName(), dto.getUserName());
+ return; // 璺宠繃鍒涘缓
+ }
newUser.setPhonenumber(dto.getPhonenumber());
}
--
Gitblit v1.9.1