From ec1927a80139bf0cb27be0b5ab7af69a13bda713 Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Wed, 23 Aug 2023 20:24:19 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E4=BF=AE=E5=A4=8D=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SsoUserServiceImpl.java      | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/SsoUserServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/SsoUserServiceImpl.java
index 2d1b2db4..09140287 100644
--- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/SsoUserServiceImpl.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/SsoUserServiceImpl.java
@@ -2,6 +2,7 @@ package com.cloud.kicc.system.service.impl;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
+import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.cloud.kicc.common.data.entity.KiccUser;
 import com.cloud.kicc.system.api.entity.SsoUser;
@@ -34,20 +35,24 @@ public class SsoUserServiceImpl extends ServiceImpl<SsoUserMapper, SsoUser> impl
         SsoUser ssoUser = new SsoUser()
                 .setId(kiccUser.getCasUserId())
                 .setNickName(kiccUser.getNickName())
-                .setPassword(kiccUser.getPassword())
                 .setEmail(kiccUser.getEmail())
                 .setPhone(kiccUser.getPhone())
                 .setSex(kiccUser.getSex())
                 .setAvatar(kiccUser.getAvatar());
         ssoUser.setRemarks(kiccUser.getRemarks());
         baseMapper.updateById(ssoUser);
-        // 修改扩展用户信息
-        userService.updateById(new User()
-                .setId(kiccUser.getId())
-                .setUserType(kiccUser.getUserType())
-                .setMapCenter(kiccUser.getMapCenter())
-                .setMapOrientation(kiccUser.getMapOrientation())
-                .setStatus(kiccUser.getStatus()));
+        try {
+            // 修改扩展用户信息
+            DynamicDataSourceContextHolder.push("master");
+            userService.updateById(new User()
+                    .setId(kiccUser.getId())
+                    .setUserType(kiccUser.getUserType())
+                    .setMapCenter(kiccUser.getMapCenter())
+                    .setMapOrientation(kiccUser.getMapOrientation())
+                    .setStatus(kiccUser.getStatus()));
+        } finally {
+            DynamicDataSourceContextHolder.poll();
+        }
     }
 
 }