From ad85aa61b0f7eba7a0ddad82eba784b015b8413a Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 17 八月 2024 17:54:13 +0800
Subject: [PATCH] 小程序用户id完善
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/PartnerServiceImpl.java | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 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 b3fceeb..80097d4 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
@@ -165,10 +165,10 @@
if(StringUtils.isEmpty(partner.getPhoneOne())){
return AjaxResult.error("合作商电话1不能为空");
}
- if(StringUtils.isEmpty(partner.getAccount())){
+ if(null == partner.getId() && StringUtils.isEmpty(partner.getAccount())){
return AjaxResult.error("登录账号不能为空");
}
- if(StringUtils.isEmpty(partner.getPassword())){
+ if(null == partner.getId() && StringUtils.isEmpty(partner.getPassword())){
return AjaxResult.error("登录密码不能为空");
}
return AjaxResult.success();
@@ -268,32 +268,32 @@
/**
* 删除合作商
- * @param id 合作商id
+ * @param ids 合作商id
*/
@Override
@GlobalTransactional(rollbackFor = Exception.class)//分布式事务
- public AjaxResult delPartner(Integer id) {
+ public AjaxResult delPartner(List<Integer> ids) {
//查询有无关联数据
//站点
- long count = siteService.count(new LambdaQueryWrapper<Site>().eq(Site::getPartnerId, id).eq(Site::getDelFlag, 0));
+ long count = siteService.count(new LambdaQueryWrapper<Site>().in(Site::getPartnerId, Arrays.asList(ids)).eq(Site::getDelFlag, 0));
if(count > 0){
return AjaxResult.error("当前合作商有关联站点，删除失败！");
}
//充电桩
- long count1 = chargingPileService.count(new LambdaQueryWrapper<TChargingPile>().eq(TChargingPile::getPartnerId, id).eq(TChargingPile::getDelFlag, 0));
+ long count1 = chargingPileService.count(new LambdaQueryWrapper<TChargingPile>().eq(TChargingPile::getPartnerId, Arrays.asList(ids)).eq(TChargingPile::getDelFlag, 0));
if(count1 > 0){
return AjaxResult.error("当前合作商有关联充电桩，删除失败！");
}
-
- Partner partner = this.getById(id);
- if(null == partner){
- return AjaxResult.error("删除失败");
+ for (Integer id : ids) {
+ Partner partner = this.getById(id);
+ if(null == partner){
+ return AjaxResult.error("删除失败");
+ }
+ this.removeById(partner);
+ SysUser user = sysUserClient.queryUserByUserName(partner.getAccount()).getData();
+ user.setDelFlag("2");
+ sysUserClient.updateUser(user);
}
- partner.setDelFlag(true);
- this.updateById(partner);
- SysUser user = sysUserClient.queryUserByUserName(partner.getAccount()).getData();
- user.setDelFlag("2");
- sysUserClient.updateUser(user);
return AjaxResult.success();
}
--
Gitblit v1.7.1