From ae8dfb86654fd98592e57bbfe820b7c2275ce8a5 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 25 九月 2025 19:00:47 +0800
Subject: [PATCH] usrer_name不进行模糊查询
---
smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java | 35 ++++++++++++++++++++++++++++++-----
1 files changed, 30 insertions(+), 5 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
index 178feb8..64cc977 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
@@ -117,10 +117,10 @@
}
if (StringUtils.isNotEmpty(externalDept.getShiJianDM()) && externalDept.getShiJianDM().equals("1")) {
int i = sysDeptMapper.insertDept(sysDept);
- log.info("ServiceExternalServiceImpl---addDeptInfo鏄惁鏂板鎴愬姛锛歿}", i);
+ log.info("ServiceExternalServiceImpl---addDeptInfo01鏄惁鏂板鎴愬姛锛歿}", i);
} else {
int i = sysDeptMapper.updateDept(sysDept);
- log.info("ServiceExternalServiceImpl---addDeptInfo鏄惁淇敼鎴愬姛锛歿}", i);
+ log.info("ServiceExternalServiceImpl---addDeptInfo02鏄惁淇敼鎴愬姛锛歿}", i);
}
return true;
}
@@ -138,8 +138,12 @@
sysUser.setUserName(externalUserInfo.getYongHuDLM());
sysUser.setOrgid(externalUserInfo.getZuZhiJGID());
//鏍规嵁userName鍒ゆ柇涓�涓嬶紝鏄笉鏄箣鍓嶆湁鏂板
- SysUser sysUser1 = sysUserMapper.selectUserByUserName(externalUserInfo.getYongHuDLM());
-
+ SysUser sysUser1 = null;
+ List<SysUser> sysUserList = sysUserMapper.selectUserList(sysUser);
+ if (CollectionUtils.isNotEmpty(sysUserList)) {
+ sysUser1 = sysUserList.get(0);
+ if (sysUserList.size() > 1) sysUser1 = getUser(sysUserList);
+ }
sysUser.setGuid(externalUserInfo.getZuZhiJGID());
sysUser.setNickName(externalUserInfo.getYongHuXM());
sysUser.setUserType("");
@@ -166,13 +170,34 @@
int i = sysUserMapper.insertUser(sysUser);
log.info("ServiceExternalServiceImpl---addDeptInfo鏄惁鏂板鎴愬姛锛歿}", i);
} else {
+ sysUser.setUserId(sysUser1.getUserId());
int i = sysUserMapper.updateUser(sysUser);
- log.info("ServiceExternalServiceImpl---addDeptInfo鏄惁淇敼鎴愬姛锛歿}", i);
+ log.info("ServiceExternalServiceImpl---addDeptInfo鏄惁淇敼鎴愬姛03锛歿}", i);
}
return true;
}
+ private SysUser getUser(List<SysUser> sysUserList) {
+ SysUser sysUser = null;
+ if (CollectionUtils.isNotEmpty(sysUserList) && sysUserList.size() > 1) {
+ // 鎸塩reate_time闄嶅簭鎺掑簭锛岃幏鍙栨渶鏂扮殑璁板綍
+ List<SysUser> sortedList = sysUserList.stream().sorted(Comparator.comparing(SysUser::getCreateTime).reversed()).collect(Collectors.toList());
+
+ // 绗竴鏉★紙鏈�鏂扮殑锛夎祴鍊肩粰sysUser1
+ sysUser = sortedList.get(0);
+
+ // 鑾峰彇闇�瑕佸垹闄ょ殑ID锛堜粠绗簩鏉″紑濮嬶級
+ List<Long> idsToDelete = sortedList.stream().skip(1).map(SysUser::getUserId).collect(Collectors.toList());
+ Long[] idArray = idsToDelete.toArray(new Long[0]);
+ // 鎵归噺鍒犻櫎鍏朵粬璁板綍
+ if (!idsToDelete.isEmpty()) {
+ sysUserMapper.deleteUserByIds(idArray);
+ }
+ }
+ return sysUser;
+ }
+
@Override
public Boolean addOrganInfo(Map dataMap) {
log.info("ServiceExternalServiceImpl---addOrganInfo鐨勬柊澧炵殑鍊间负锛歿}", dataMap);
--
Gitblit v1.9.3