From 3c89095e800c12917086540552bc97033c04ea58 Mon Sep 17 00:00:00 2001
From: wxyclub <tjzdwxy@163.com>
Date: Tue, 10 Oct 2023 11:46:52 +0800
Subject: [PATCH] =?UTF-8?q?add:=20=E6=A0=87=E5=87=86=E4=BD=93=E7=B3=BB?=
 =?UTF-8?q?=E6=A0=91=E5=A2=9E=E5=88=A0=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SarMenuStandardNewController.java         |  9 +++++++++
 .../service/ISarMenuStandardNewService.java   |  2 ++
 .../SarMenuStandardNewServiceNewImpl.java     | 19 +++++++++++++++++--
 3 files changed, 28 insertions(+), 2 deletions(-)

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<SarMenuStandard
         return Result.success(iSarMenuStandardNewService.addMenuStandard(sarMenuStandardNew));
     }
 
+    @ApiOperation("根据菜单ID查询菜单")
+    @GetMapping("/getMenuStandardById")
+    public ResponseMessage<SarMenuStandard> 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<SarMenuStandardNew>
     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<SarMenuStandar
         return dao.insert(sarMenuStandard);
     }
 
+    @Override
+    public SarMenuStandard getMenuStandardById(String menuId) {
+        SarMenuStandard sarMenuStandard = dao.selectById(menuId);
+        if(sarMenuStandard != null  && StringUtils.isNotBlank(sarMenuStandard.getParentIds())){
+            LambdaQueryWrapper<SarMenuStandard> wrapper = new LambdaQueryWrapper<>();
+            wrapper.in(SarMenuStandard::getId,Arrays.asList(sarMenuStandard.getParentIds().split(",")));
+            List<SarMenuStandard> 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<SarMenuStandar
         if(access!=null && !access.isEmpty()){
             queryWrapper.in(null!=access && !access.isEmpty(),"ID",access);
         }
-        queryWrapper.eq("VALID_FLAG","0");
+        queryWrapper.eq("VALID_FLAG",0);
         queryWrapper.isNull("PARENT_ID");
         queryWrapper.orderByAsc("DISPLAY_SEQ");
         TsResources=dao.selectList(queryWrapper);
@@ -135,6 +149,7 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl<SarMenuStandar
             if(access!=null && !access.isEmpty()){
                 TsResourceQueryWrapper.in(null!=access && !access.isEmpty(),"ID",access);
             }
+            TsResourceQueryWrapper.eq("VALID_FLAG",0);
             TsResourceQueryWrapper.orderByAsc("DISPLAY_SEQ");
             List<SarMenuStandard> children=dao.selectList(TsResourceQueryWrapper);
             resource.setChildren(recursionGetListChildrenStand((resource),(children)));