FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop_3' into 'develop_master'

Browse Source 
Develop 3

please agree my request

See merge request !7
This commit is contained in:
super_liu
2021-06-17 09:44:43 +00:00
parent 37930e0b07 3f79fe9df6
commit 3d88678e5f
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenu/entity/SarMenu.java
+7
View File
@@ -1,6 +1,9 @@
package com.adc.da.slrs.sarMenu.entity; package com.adc.da.slrs.sarMenu.entity;
import com.adc.da.base.entity.BaseEntity; 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 com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.Date; import java.util.Date;
@@ -30,6 +33,8 @@ public class SarMenu extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@TreeNodeId
@ApiModelProperty(value = "主键") @ApiModelProperty(value = "主键")
@TableId("ID") @TableId("ID")
private String id; private String id;
@@ -38,10 +43,12 @@ public class SarMenu extends BaseEntity {
@TableField("SOR_DIVIDE") @TableField("SOR_DIVIDE")
private String sorDivide; private String sorDivide;
@TreeNodeName
@ApiModelProperty(value = "目录名称") @ApiModelProperty(value = "目录名称")
@TableField("MENU_NAME") @TableField("MENU_NAME")
private String menuName; private String menuName;
@TreeNodeParentId
@ApiModelProperty(value = "父级ID") @ApiModelProperty(value = "父级ID")
@TableField("PARENT_ID") @TableField("PARENT_ID")
private String parentId; private String parentId;
adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenu/service/impl/SarMenuServiceImpl.java
+1 -1
View File
@@ -140,7 +140,7 @@ public class SarMenuServiceImpl extends ServiceImpl<SarMenuDao, SarMenu> impleme
public List<String> getChildMenuList (String menuId) { public List<String> getChildMenuList (String menuId) {
List<String> menuIds = new ArrayList<>(); List<String> menuIds = new ArrayList<>();
if (StringUtils.isNotEmpty(menuId)) { 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); Tree tree = new Tree(SarMenuList);
TreeNode treeNode = tree.getTreeNode(menuId); TreeNode treeNode = tree.getTreeNode(menuId);
if (treeNode != null) { if (treeNode != null) {