merge

luodangjia

2024-11-04 e0fc8f7e2230b51e3bbe8dea43790cf11b7170e9

 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());
      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();
   }
   
@@ -284,12 +286,12 @@
   public AjaxResult delPartner(List<Integer> ids) {
      //查询有无关联数据
      //站点
      long count = siteService.count(new LambdaQueryWrapper<Site>().in(Site::getPartnerId, Arrays.asList(ids)).eq(Site::getDelFlag, 0));
      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, Arrays.asList(ids)).eq(TChargingPile::getDelFlag, 0));
      long count1 = chargingPileService.count(new LambdaQueryWrapper<TChargingPile>().in(TChargingPile::getPartnerId, ids).eq(TChargingPile::getDelFlag, 0));
      if(count1 > 0){
         return AjaxResult.error("该合作商已关联充电桩不可删除!");
      }
@@ -298,7 +300,7 @@
         if(null == partner){
            return AjaxResult.error("删除失败");
         }
         this.removeById(partner);
         this.removeById(id);
         SysUser user = sysUserClient.queryUserByUserName(partner.getAccount()).getData();
         user.setDelFlag("2");
         sysUserClient.updateUser(user);
@@ -338,6 +340,9 @@
   @Override
   public GetPermissionConfigurationDTO getPermissionConfiguration(Integer siteId, Integer partnerId) {
      Partner partner = this.getById(partnerId);
      if(null == partner){
         throw new RuntimeException("该站点合作商无效");
      }
      GetPermissionConfigurationDTO dto = new GetPermissionConfigurationDTO();
      dto.setPermissionRemarks(partner.getPermissionRemarks());
      List<TPartnerSite> list = partnerSiteService.list(new LambdaQueryWrapper<TPartnerSite>()
@@ -370,7 +375,7 @@
            child.put("selected", collect.contains(siteMenu.getMenuId()));
            list2.add(child);
         }
         menu.put("selected", list2.size() > 0 ? true : false);
         menu.put("selected", collect.contains(tSiteMenu.getMenuId()));
         menu.put("child", list2);
         list1.add(menu);
      }