diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/controller/SarMenuStandardNewController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/controller/SarMenuStandardNewController.java index 9a05948a..9e95e0a1 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/controller/SarMenuStandardNewController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/controller/SarMenuStandardNewController.java @@ -61,6 +61,15 @@ public class SarMenuStandardNewController extends BaseController getMenuStandardById(@RequestParam String menuId){ + if (StringUtils.isBlank(menuId)) { + return Result.error("获取失败,菜单ID为空"); + } + return Result.success(iSarMenuStandardNewService.getMenuStandardById(menuId)); + } + @ApiOperation("修改标准体系菜单项") @PutMapping("/updateMenuStandard") public ResponseMessage updateMenuStandard(@RequestBody SarMenuStandardNew sarMenuStandardNew) { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/ISarMenuStandardNewService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/ISarMenuStandardNewService.java index 5fea337d..bb41985f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/ISarMenuStandardNewService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/ISarMenuStandardNewService.java @@ -27,4 +27,6 @@ public interface ISarMenuStandardNewService extends IService Integer updateMenuStandard(SarMenuStandardNew sarMenuStandardNew); Integer deleteMenuStandard(String menuId); + + SarMenuStandard getMenuStandardById(String menuId); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java index 9d998669..7d1a640c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java @@ -7,7 +7,6 @@ import com.adc.da.sys.sarMenuStandard.dao.SarMenuStandardDao; import com.adc.da.sys.sarMenuStandard.entity.SarMenuStandard; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; @@ -86,6 +85,21 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); + wrapper.in(SarMenuStandard::getId,Arrays.asList(sarMenuStandard.getParentIds().split(","))); + List menuStandards = dao.selectList(wrapper); + if(!menuStandards.isEmpty()){ + String parentIdsName = menuStandards.stream().map(SarMenuStandard::getMenuName).collect(Collectors.joining(",")); + sarMenuStandard.setParentIdsName(parentIdsName); + } + } + return sarMenuStandard; + } + @Override public Integer updateMenuStandard(SarMenuStandardNew sarMenuStandardNew) { SarMenuStandard menuStandarddb = dao.selectById(sarMenuStandardNew.getId()); @@ -123,7 +137,7 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl children=dao.selectList(TsResourceQueryWrapper); resource.setChildren(recursionGetListChildrenStand((resource),(children)));