From 8c5008e86903c89fa8ce2c7faa467213545d41e7 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Sat, 22 Jan 2022 19:13:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E5=B8=A6=E5=85=A5=E6=A0=87=E5=87=86=E7=9A=84=E7=9B=AE?=
 =?UTF-8?q?=E5=BD=95=E4=BD=93=E7=B3=BB:=E8=BF=94=E5=9B=9E=E4=BD=93?=
 =?UTF-8?q?=E7=B3=BB=E7=9B=AE=E5=BD=95=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../slrs/sarStandMenu/dao/SarStandMenuDao.java |  2 ++
 .../slrs/sarStandMenu/entity/SarStandMenu.java |  5 ++++-
 .../controller/SarStandardsInfoController.java |  2 +-
 .../mapper/SarStandMenu/SarStandMenuMapper.xml | 18 +++++++++++++++++-
 4 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/dao/SarStandMenuDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/dao/SarStandMenuDao.java
index 1c400103..ccda4edd 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/dao/SarStandMenuDao.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/dao/SarStandMenuDao.java
@@ -29,4 +29,6 @@ public interface SarStandMenuDao extends BaseMapper<SarStandMenu> {
 
     List<SarStandMenu> selectAllMenuByStandId(SarStandMenu sarStandMenuEO);
 
+    List<SarStandMenu> getMenuByStandId(SarStandMenu sarStandMenu);
+
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/entity/SarStandMenu.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/entity/SarStandMenu.java
index b10b9a78..a1421881 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/entity/SarStandMenu.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/entity/SarStandMenu.java
@@ -15,7 +15,7 @@ import org.springframework.data.annotation.Transient;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author super_liu
@@ -58,4 +58,7 @@ public class SarStandMenu extends BaseEntity {
     private List<String> menuIds;
 
 
+    @TableField(exist = false)
+    private String menuName;
+
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java
index e9d30624..ad62cb8b 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java
@@ -588,7 +588,7 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
     @GetMapping("/getStandMenuId")
     public ResponseMessage<List<SarStandMenu>> getStandMenuId(SarStandMenu getStandId){
 
-        List<SarStandMenu> sarStandMenus = sarStandMenuDao.selectAllMenuByStandId(getStandId);
+        List<SarStandMenu> sarStandMenus = sarStandMenuDao.getMenuByStandId(getStandId);
 
         return Result.success(sarStandMenus);
 
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml
index 0425a16a..14246d2d 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml
@@ -12,7 +12,7 @@
 
     <!-- SAR_STAND_MENU table all fields -->
     <sql id="Base_Column_List" >
-     valid_flag, menu_id, stand_id, id
+     valid_flag, menu_id, stand_id, id,menu_name
   </sql>
 
     <!-- 查询条件 -->
@@ -82,5 +82,21 @@
         from SAR_STAND_MENU
         where stand_id = #{standId} and valid_flag=0
     </select>
+    <select id="getMenuByStandId" resultType="com.adc.da.slrs.sarStandMenu.entity.SarStandMenu">
+                SELECT
+        	SAR_STAND_MENU.valid_flag as validFlag,
+        	menu_id as menuId,
+        	stand_id as standId,
+        	SAR_STAND_MENU.id as id,
+        	MENU_NAME as menuName
+        FROM
+        	SAR_STAND_MENU
+        LEFT JOIN ts_resource ON SAR_STAND_MENU.MENU_ID = ts_resource.ID
+        WHERE
+        	stand_id =  #{standId}
+        AND SAR_STAND_MENU.VALID_FLAG = 0
+
+    </select>
+
 
 </mapper>