From 2f226b5b2d80be1eba34d3c641b7cc08be0c322c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 09 八月 2024 10:32:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/PartnerServiceImpl.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 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 3e8b420..4b0e2ca 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
@@ -4,10 +4,12 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.chargingPile.api.dto.PartnerListDTO;
import com.ruoyi.chargingPile.api.model.Partner;
+import com.ruoyi.chargingPile.api.model.Site;
import com.ruoyi.chargingPile.api.query.GetPartnerList;
import com.ruoyi.chargingPile.dto.ResetPassword;
import com.ruoyi.chargingPile.mapper.PartnerMapper;
import com.ruoyi.chargingPile.service.IPartnerService;
+import com.ruoyi.chargingPile.service.ISiteService;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.web.domain.AjaxResult;
@@ -38,6 +40,9 @@
@Resource
private SysUserClient sysUserClient;
+
+ @Resource
+ private ISiteService siteService;
@@ -114,6 +119,8 @@
user.setStatus("0");
user.setDelFlag("0");
user.setRoleId(partner.getRoleId().longValue());
+ user.setRoleType(2);
+ user.setObjectId(partner.getId());
R r = sysUserClient.addSysUser(user);
if(200 != r.getCode()){
throw new RuntimeException(r.getMsg());
@@ -220,6 +227,8 @@
user.setAvatar(partner.getLogoUrl());
user.setPassword(partner.getPassword());
user.setRoleId(partner.getRoleId().longValue());
+ user.setRoleType(2);
+ user.setObjectId(partner.getId());
R r = sysUserClient.addSysUser(user);
if(200 != r.getCode()){
throw new RuntimeException(r.getMsg());
@@ -250,6 +259,10 @@
public AjaxResult delPartner(Integer id) {
//查询有无关联数据
//站点
+ long count = siteService.count(new LambdaQueryWrapper<Site>().eq(Site::getPartnerId, id).eq(Site::getDelFlag, 0));
+ if(count > 0){
+ return AjaxResult.error("当前合作商有关联得站点，删除失败！");
+ }
// todo 代码完善
//充电桩
--
Gitblit v1.7.1