diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandMenu/service/impl/SarBussStandMenuServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandMenu/service/impl/SarBussStandMenuServiceImpl.java
index 713f8f63..79184a17 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandMenu/service/impl/SarBussStandMenuServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandMenu/service/impl/SarBussStandMenuServiceImpl.java
@@ -8,6 +8,7 @@ import com.adc.da.slrs.sarResource.service.ITsResourceService;
import com.adc.da.slrs.sarStandMenu.entity.SarStandMenu;
import com.adc.da.sys.sarMenuStandard.entity.SarMenuStandard;
import com.adc.da.sys.sarMenuStandard.service.ISarMenuStandardService;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang3.StringUtils;
@@ -17,6 +18,8 @@ import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
/**
*
@@ -51,9 +54,23 @@ public class SarBussStandMenuServiceImpl extends ServiceImpl sarStandMenuWrapper = new LambdaUpdateWrapper<>();
- sarStandMenuWrapper.eq(SarBussStandMenu::getBussStandId, id);
- remove(sarStandMenuWrapper);
+ LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(SarBussStandMenu::getBussStandId, id);
+ List list = list(wrapper);
+ Set collect = list.stream().map(SarBussStandMenu::getMenuId).collect(Collectors.toSet());
+ List menuIds = new ArrayList<>();
+ for (String menuId : collect) {
+ SarMenuStandard menuStand = iSarMenuStandardService.getById(menuId);
+ if (menuStand != null) {
+ menuIds.add(menuStand.getId());
+ }
+ }
+ if (menuIds.size() > 0) {
+ LambdaUpdateWrapper sarStandMenuWrapper = new LambdaUpdateWrapper<>();
+ sarStandMenuWrapper.eq(SarBussStandMenu::getBussStandId, id);
+ sarStandMenuWrapper.in(SarBussStandMenu::getMenuId,menuIds);
+ remove(sarStandMenuWrapper);
+ }
}
@Override
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
index a4edcc68..4942ddaf 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
@@ -1391,6 +1391,8 @@ public class SarBussionessStandServiceImpl extends ServiceImpl list = Arrays.asList(txlbbuss.toString().split("/"));
+ txlbbuss = list.get(list.size() - 1);
// 配置体系类别
String txlbBussLevel = getParentNodePathRecursive((String) txlbbuss);
sarBussionessStandEO.getAttrInfoCaseMap().put("txlbbuss",txlbBussLevel);
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/service/impl/SarStandMenuServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/service/impl/SarStandMenuServiceImpl.java
index ddbabb3b..845b155e 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/service/impl/SarStandMenuServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/service/impl/SarStandMenuServiceImpl.java
@@ -14,7 +14,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
/**
*
@@ -50,9 +53,23 @@ public class SarStandMenuServiceImpl extends ServiceImpl sarStandMenuWrapper = new LambdaUpdateWrapper<>();
- sarStandMenuWrapper.eq(SarStandMenu::getStandId, id);
- remove(sarStandMenuWrapper);
+ LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(SarStandMenu::getStandId, id);
+ List list = list(wrapper);
+ Set collect = list.stream().map(SarStandMenu::getMenuId).collect(Collectors.toSet());
+ List menuIds = new ArrayList<>();
+ for (String menuId : collect) {
+ SarMenuStandard menuStand = iSarMenuStandardService.getById(menuId);
+ if (menuStand != null) {
+ menuIds.add(menuStand.getId());
+ }
+ }
+ if (menuIds.size() > 0) {
+ LambdaUpdateWrapper sarStandMenuWrapper = new LambdaUpdateWrapper<>();
+ sarStandMenuWrapper.eq(SarStandMenu::getStandId, id);
+ sarStandMenuWrapper.in(SarStandMenu::getMenuId,menuIds);
+ remove(sarStandMenuWrapper);
+ }
}
@Override