From 11b718b78ee92d2349072c972e7155001693d69e Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 28 十月 2024 15:39:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/PartnerServiceImpl.java |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/PartnerServiceImpl.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/PartnerServiceImpl.java
index 728a9f4..e02da4e 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/PartnerServiceImpl.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/PartnerServiceImpl.java
@@ -145,13 +145,15 @@
 		user.setDelFlag("0");
 		user.setRoleId(partner.getRoleId().longValue());
 		user.setRoleType(2);
-		user.setObjectId(partner.getId());
-		//添加新数据
-		this.save(partner);
-		R r = sysUserClient.addSysUser(user);
+		R<Long> r = sysUserClient.addSysUser(user);
 		if(200 != r.getCode()){
 			throw new RuntimeException(r.getMsg());
 		}
+		//添加新数据
+		this.save(partner);
+		user = sysUserClient.getSysUser(r.getData()).getData();
+		user.setObjectId(partner.getId());
+		sysUserClient.updateUser(user);
 		return AjaxResult.success();
 	}
 	

--
Gitblit v1.7.1