From 2d403dcc9e1bf1cae34bca0f0d5e2cdc703733c1 Mon Sep 17 00:00:00 2001
From: yitonglei <ytl653@163.com>
Date: Fri, 26 Aug 2022 09:05:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8E=B7=E4=BB=8E=E9=87=91?=
 =?UTF-8?q?=E5=AE=8F=E7=BD=91=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=EF=BC=8C=E4=BD=86=E6=98=AF=E8=BF=98=E6=98=AF=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E4=B8=8D=E5=88=B0guid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/renren/modules/sys/entity/SysUserEntity.java  | 2 ++
 .../modules/sys/service/impl/SysUserServiceImpl.java      | 4 +++-
 .../src/main/java/io/renren/common/utils/JhlDAPTool.java  | 8 +++++---
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/renren-admin/src/main/java/io/renren/modules/sys/entity/SysUserEntity.java b/renren-admin/src/main/java/io/renren/modules/sys/entity/SysUserEntity.java
index 030bf5a3..28f0ea02 100644
--- a/renren-admin/src/main/java/io/renren/modules/sys/entity/SysUserEntity.java
+++ b/renren-admin/src/main/java/io/renren/modules/sys/entity/SysUserEntity.java
@@ -79,4 +79,6 @@ public class SysUserEntity extends BaseEntity {
 	 */
 	private String guid;
 
+	private String ywMobile;
+
 }
\ No newline at end of file
diff --git a/renren-admin/src/main/java/io/renren/modules/sys/service/impl/SysUserServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/sys/service/impl/SysUserServiceImpl.java
index 81240f41..98ca8f26 100644
--- a/renren-admin/src/main/java/io/renren/modules/sys/service/impl/SysUserServiceImpl.java
+++ b/renren-admin/src/main/java/io/renren/modules/sys/service/impl/SysUserServiceImpl.java
@@ -381,7 +381,8 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
                             if (m.get(("username")) != null) {
                                 String userName = m.get("username").toString();
                                 SysUserEntity user = sysUserDao.getUserByName(userName);
-                                if (user == null) {//用户表中没有该用户，插入
+                                SysUserEntity userById = sysUserDao.getById(Long.valueOf(m.get("id").toString()));
+                                if (user == null && userById == null) {//用户表中没有该用户，插入
                                     SysUserEntity newUser = new SysUserEntity();
                                     newUser.setUsername(userName);
                                     newUser.setSuperAdmin(0);
@@ -390,6 +391,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
                                     newUser.setRealName(m.get("real_name") == null ? "" : m.get("real_name").toString());
                                     newUser.setEmail(m.get("email") == null ? "" : m.get("email").toString());
                                     newUser.setMobile(m.get("mobile") == null ? "" : m.get("mobile").toString());
+                                    newUser.setYwMobile(m.get("YwMobile") == null ? "" : m.get("YwMobile").toString());
                                     newUser.setStatus(1);//账号状态 1正常 0停用
                                     //给dept_id赋值
                                     String deptNames = m.get("distinguishedName") == null ? "" : m.get("distinguishedName").toString();
diff --git a/renren-common/src/main/java/io/renren/common/utils/JhlDAPTool.java b/renren-common/src/main/java/io/renren/common/utils/JhlDAPTool.java
index 999485dd..88010502 100644
--- a/renren-common/src/main/java/io/renren/common/utils/JhlDAPTool.java
+++ b/renren-common/src/main/java/io/renren/common/utils/JhlDAPTool.java
@@ -100,14 +100,16 @@ public class JhlDAPTool {
                                 user.put("email",next.get().toString());
                             }else if("telephoneNumber".equals(next.getID())){
                                 user.put("mobile",next.get().toString());
+                            }else if("mobile".equals(next.getID())){
+                                user.put("ywMobile",next.get().toString());
                             }else if("distinguishedName".equals(next.getID())){
                                 user.put("distinguishedName",next.get().toString());
                             }else if("objectGUID".equals(next.getID())){
-                                String guidStr = next.getID().toString();
+                                String guidStr = next.get().toString();
+                                //Object o = next.get(0);
                                 user.put("id",SingleID.getSingleID(guidStr));
-                                String guid = guidStr.substring(1,guidStr.length()-1);
+                                String guid = guidStr.substring(1,guidStr.length() - 1);
                                 user.put("guid",guid);
-
                             }
                         }
                         lm.add(user);