Parcourir la source

system/menu/all-tree 增加所属子系统(systemId)搜索条件

phoenix il y a 1 an
Parent
commit
603b470f17

+ 1 - 0
src/main/java/com/xjrsoft/module/system/controller/MenuController.java

@@ -111,6 +111,7 @@ public class MenuController {
                 MPJWrappers.<Menu>lambdaJoin()
                         .like(StrUtil.isNotEmpty(dto.getTitle()), Menu::getTitle, dto.getTitle())
                         .like(StrUtil.isNotEmpty(dto.getName()), Menu::getName, dto.getName())
+                        .like(ObjectUtil.isNotNull(dto.getSystemId()) && dto.getSystemId() > 0, Menu::getSystemId, dto.getSystemId())
                         .eq(Menu::getSystemType, dto.getSystemType())
                         .select(Menu::getId)
                         .select(Menu.class, x -> VoToColumnUtil.fieldsToColumns(MenuTreeVo.class).contains(x.getProperty()))

+ 5 - 0
src/main/java/com/xjrsoft/module/system/dto/MenuTreeDto.java

@@ -1,5 +1,6 @@
 package com.xjrsoft.module.system.dto;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NonNull;
 import org.hibernate.validator.constraints.Length;
@@ -16,8 +17,12 @@ import javax.validation.constraints.NotNull;
 public class MenuTreeDto {
 
     @Length(max = 20,message = "系统类型!")
+    @ApiModelProperty("系统类型")
     private String systemType;
 
+    @ApiModelProperty("系统主键(主系统默认为0)")
+    private Long systemId;
+
     @Length(max = 20,message = "菜单名不能大于20个字符!")
     private String title;