From 9142c0ea84b8dd7d190c9f420185eb3ba4edd79c Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 23 十月 2024 13:34:51 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/PartnerServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 2f5a954..7ee4de8 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,9 +145,9 @@
user.setDelFlag("0");
user.setRoleId(partner.getRoleId().longValue());
user.setRoleType(2);
- user.setObjectId(partner.getId());
//添加新数据
this.save(partner);
+ user.setObjectId(partner.getId());
R r = sysUserClient.addSysUser(user);
if(200 != r.getCode()){
throw new RuntimeException(r.getMsg());
@@ -286,7 +286,7 @@
//站点
long count = siteService.count(new LambdaQueryWrapper<Site>().in(Site::getPartnerId, ids).eq(Site::getDelFlag, 0));
if(count > 0){
- return AjaxResult.error("该合作商已关联站点不可删除!");
+ return AjaxResult.error("该合作商已关联站点不可删除");
}
//充电桩
long count1 = chargingPileService.count(new LambdaQueryWrapper<TChargingPile>().in(TChargingPile::getPartnerId, ids).eq(TChargingPile::getDelFlag, 0));
--
Gitblit v1.7.1