合并代码

Pu Zhibing

2024-10-18 4657b9ad5bb757b1d1ccaf2372e781e461778b4f

 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/PartnerServiceImpl.java

@@ -146,12 +146,12 @@
      user.setRoleId(partner.getRoleId().longValue());
      user.setRoleType(2);
      user.setObjectId(partner.getId());
      //添加新数据
      this.save(partner);
      R r = sysUserClient.addSysUser(user);
      if(200 != r.getCode()){
         throw new RuntimeException(r.getMsg());
      }
      //添加新数据
      this.save(partner);
      return AjaxResult.success();
   }
   
@@ -286,7 +286,7 @@
      //站点
      long count = siteService.count(new LambdaQueryWrapper<Site>().in(Site::getPartnerId, Arrays.asList(ids)).eq(Site::getDelFlag, 0));
      if(count > 0){
         return AjaxResult.error("该合作商已关联站点不可删除!");
         return AjaxResult.error("该合作商已关联站点不可删除");
      }
      //充电桩
      long count1 = chargingPileService.count(new LambdaQueryWrapper<TChargingPile>().in(TChargingPile::getPartnerId, Arrays.asList(ids)).eq(TChargingPile::getDelFlag, 0));