Merge branch 'develop_3' into 'develop_master'

标准入库流程带入标准的目录体系:返回体系目录名称

See merge request LiuChao/foton-slrs-system-rest!386

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);
+
 }

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;
+
 }

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);