From b0ec9895cde2519bc085ac40acbeea89ae8b6f9d Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期四, 17 七月 2025 16:44:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysThirdAccountServiceImpl.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysThirdAccountServiceImpl.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysThirdAccountServiceImpl.java
index 8d2345c..09a5d95 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysThirdAccountServiceImpl.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysThirdAccountServiceImpl.java
@@ -72,7 +72,7 @@
query.eq(SysThirdAccount::getThirdUserUuid,thirdUserUuid);
SysThirdAccount account = sysThirdAccountMapper.selectOne(query);
//閫氳繃鐢ㄦ埛鍚嶆煡璇㈡暟鎹簱鏄惁宸插瓨鍦�
- SysUser userByName = sysUserMapper.getUserByName(thirdUserUuid);
+ SysUser userByName = sysUserMapper.getUserByName(thirdUserUuid.substring(2));
if(null!=userByName){
//濡傛灉璐﹀彿瀛樺湪鐨勮瘽锛屽垯鑷姩鍔犱笂涓�涓椂闂存埑
String format = DateUtils.yyyymmddhhmmss.get().format(new Date());
@@ -83,7 +83,8 @@
user.setActivitiSync(CommonConstant.ACT_SYNC_0);
user.setDelFlag(CommonConstant.DEL_FLAG_0);
user.setStatus(1);
- user.setUsername(thirdUserUuid);
+ //鐢ㄦ埛鍚嶅彇宸ュ彿鍘婚櫎鍓嶄袱浣嶅瓧姣嶅悗闈㈢殑鍊�
+ user.setUsername(thirdUserUuid.substring(2));
user.setPhone(phone);
//璁剧疆鍒濆瀵嗙爜
String salt = oConvertUtils.randomGen(8);
@@ -92,6 +93,7 @@
user.setPassword(passwordEncode);
user.setRealname(account.getRealname());
user.setAvatar(account.getAvatar());
+ user.setWorkNo(thirdUserUuid);//娌冨厠鐜板満sys_user琛ㄥ宸ュ彿瀛楁璁剧疆浜嗗敮涓�绱㈠紩锛堜紒涓氬井淇℃嬁鍒扮殑鐢ㄦ埛鏁版嵁thirdUserUuid灏辨槸宸ュ彿锛夛紝璇ュ瓧娈靛繀椤荤粰鍊�
String s = this.saveThirdUser(user);
//鏇存柊鐢ㄦ埛绗笁鏂硅处鎴疯〃鐨剈serId
SysThirdAccount sysThirdAccount = new SysThirdAccount();
@@ -147,6 +149,7 @@
user.setRealname(tlm.getUsername());
user.setThirdUserUuid(tlm.getUuid());
user.setThirdUserId(tlm.getUuid());
+ user.setPhone(tlm.getPhone());
super.save(user);
return user;
}
--
Gitblit v1.9.3