From 163a0f939b1b5be64bae8ef4e370c7da249ef1d1 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 6 Sep 2022 18:11:38 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=99=BB=E5=BD=95):=20=E9=92=89=E9=92=89?=
 =?UTF-8?q?=E6=89=AB=E7=A0=81=E7=99=BB=E5=BD=95=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plugins/server/XDingtalkServer.java         |  2 +-
 .../io/dataease/service/sys/SysUserService.java | 17 +++--------------
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/backend/src/main/java/io/dataease/plugins/server/XDingtalkServer.java b/backend/src/main/java/io/dataease/plugins/server/XDingtalkServer.java
index cc5603e1b0..baa5927cf9 100644
--- a/backend/src/main/java/io/dataease/plugins/server/XDingtalkServer.java
+++ b/backend/src/main/java/io/dataease/plugins/server/XDingtalkServer.java
@@ -88,7 +88,7 @@ public class XDingtalkServer {
                 DEException.throwException("未开启钉钉");
             }
             DingUserEntity dingUserEntity = dingtalkXpackService.userInfo(code);
-            String username = dingUserEntity.getUserId();
+            String username = dingUserEntity.getUserid();
             String unionid = dingUserEntity.getUnionid();
             SysUserEntity sysUserEntity = authUserService.getUserBySub(unionid, 5);
             if (null == sysUserEntity) {
diff --git a/backend/src/main/java/io/dataease/service/sys/SysUserService.java b/backend/src/main/java/io/dataease/service/sys/SysUserService.java
index a361c5b4b2..3d55955005 100644
--- a/backend/src/main/java/io/dataease/service/sys/SysUserService.java
+++ b/backend/src/main/java/io/dataease/service/sys/SysUserService.java
@@ -147,13 +147,7 @@ public class SysUserService {
         sysUser.setIsAdmin(false);
         sysUser.setSub(userId);
         sysUserMapper.insert(sysUser);
-        SysUser dbUser = findOne(sysUser);
-        if (null != dbUser && null != dbUser.getUserId()) {
-            // 默认角色是普通员工
-            List<Long> roleIds = new ArrayList<Long>();
-            roleIds.add(2L);
-            saveUserRoles( dbUser.getUserId(), roleIds);
-        }
+
     }
 
     @Transactional
@@ -161,7 +155,7 @@ public class SysUserService {
         long now = System.currentTimeMillis();
         SysUser sysUser = new SysUser();
 
-        sysUser.setUsername(dingUserEntity.getUserId());
+        sysUser.setUsername(dingUserEntity.getUserid());
         sysUser.setNickName(dingUserEntity.getName());
         sysUser.setEmail(email);
         sysUser.setPassword(CodingUtil.md5(DEFAULT_PWD));
@@ -175,12 +169,7 @@ public class SysUserService {
         sysUser.setSub(dingUserEntity.getUnionid());
         sysUser.setPhone(dingUserEntity.getMobile());
         sysUserMapper.insert(sysUser);
-        SysUser dbUser = findOne(sysUser);
-        /*if (null != dbUser && null != dbUser.getUserId()) {
-            List<Long> roleIds = new ArrayList<Long>();
-            roleIds.add(2L);
-            saveUserRoles( dbUser.getUserId(), roleIds);
-        }*/
+
     }
 
     @Transactional