From 7e383cd9001f48141449c2f4e7e007348217f4f8 Mon Sep 17 00:00:00 2001 From: luodangjia <luodangjia> Date: 星期四, 31 十月 2024 16:11:14 +0800 Subject: [PATCH] merge --- ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java index 562043a..984a48e 100644 --- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java +++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java @@ -360,11 +360,16 @@ TAccountingStrategy one = accountingStrategyService.lambdaQuery().eq(TAccountingStrategy::getId, byId.getParentId()).one(); byId.setSiteId(one.getSiteId()); //将site表对应的模板id修改为新的这个 - Site byId1 = siteService.getById(one.getSiteId()); - if (byId1!=null) { - byId1.setAccountingStrategyId(byId.getId()); - siteService.updateById(byId1); + List<Site> list = siteService.lambdaQuery().eq(Site::getAccountingStrategyId, one.getId()).list(); + for (Site site : list) { + site.setAccountingStrategyId(byId.getId()); } + siteService.updateBatchById(list); + // + + + + // accountingStrategyService.removeById(one.getId()); } //硬件 -- Gitblit v1.7.1