Merge branch 'develop_3' into 'develop_master'

Develop 3

please agree my request

See merge request !7

adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenu/entity/SarMenu.java

@@ -1,6 +1,9 @@
 package com.adc.da.slrs.sarMenu.entity;
 
 import com.adc.da.base.entity.BaseEntity;
+import com.adc.da.utils.treetool.annotation.TreeNodeId;
+import com.adc.da.utils.treetool.annotation.TreeNodeName;
+import com.adc.da.utils.treetool.annotation.TreeNodeParentId;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.util.Date;
@@ -30,6 +33,8 @@ public class SarMenu extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
 
+
+    @TreeNodeId
     @ApiModelProperty(value = "主键")
     @TableId("ID")
     private String id;
@@ -38,10 +43,12 @@ public class SarMenu extends BaseEntity {
     @TableField("SOR_DIVIDE")
     private String sorDivide;
 
+    @TreeNodeName
     @ApiModelProperty(value = "目录名称")
     @TableField("MENU_NAME")
     private String menuName;
 
+    @TreeNodeParentId
     @ApiModelProperty(value = "父级ID")
     @TableField("PARENT_ID")
     private String parentId;

adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenu/service/impl/SarMenuServiceImpl.java

@@ -140,7 +140,7 @@ public class SarMenuServiceImpl extends ServiceImpl<SarMenuDao, SarMenu> impleme
     public List<String> getChildMenuList (String menuId) {
         List<String> menuIds = new ArrayList<>();
         if (StringUtils.isNotEmpty(menuId)) {
-            List<SarMenu> SarMenuList = dao.selectList(new QueryWrapper<>());
+            List<SarMenu> SarMenuList = dao.selectList(new QueryWrapper<SarMenu>().eq("ID",menuId));
             Tree tree = new Tree(SarMenuList);
             TreeNode treeNode = tree.getTreeNode(menuId);
             if (treeNode != null) {