From 6c447392af8f4da13a0fded0badacf44532bd653 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Fri, 17 May 2019 16:34:31 +0800 Subject: [PATCH] =?UTF-8?q?[=E8=A7=92=E8=89=B2][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E8=A7=92=E8=89=B2ID=E5=80=92=E5=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/sys/MallRoleController.java | 1 + .../java/com/iformall/domain/po/MallRole.java | 65 ++----------------- 2 files changed, 5 insertions(+), 61 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java index 3d177f65e..2a6dd38fa 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java @@ -57,6 +57,7 @@ public class MallRoleController extends BaseController { logger.debug("[" + getIpAddr() + "] MallRoleController::list"); String tenantId = getTenantId(); sysRole.setTenantId(tenantId); + sysRole.setSortColumns(MallRole.Field.Id_DESC); final PageInfo page = sysRoleService.listAsPage(sysRole, pageNum, pageSize); for (MallRole r : page.getList()) { MallRolePermission p = new MallRolePermission(); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/MallRole.java b/mallinkService/src/main/java/com/iformall/domain/po/MallRole.java index fe8013e8f..e0b444f98 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/MallRole.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/MallRole.java @@ -1,5 +1,7 @@ package com.iformall.domain.po; +import lombok.Data; + import javax.persistence.*; import javax.persistence.Transient; import java.util.List; @@ -7,6 +9,7 @@ import javax.persistence.Id; import java.io.Serializable; @Table(name = "mall_role") +@Data public class MallRole implements Serializable { private static final long serialVersionUID = 1L; @@ -17,79 +20,19 @@ public class MallRole implements Serializable { protected List ids; @Transient protected String sortColumns; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - public String getSortColumns() { - return sortColumns; - } - - public List getIds() { - return ids; - } - - public void setIds(List ids) { - this.ids = ids; - } - - - - /*租户ID**/ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; - /*角色名称**/ @io.swagger.annotations.ApiModelProperty(value="角色名称",name="name") private String name; - /*是否可用 0可用 1不可用**/ @io.swagger.annotations.ApiModelProperty(value="是否可用 0可用 1不可用",name="available") private String available; - /*角色描述**/ @io.swagger.annotations.ApiModelProperty(value="角色描述",name="description") private String description; @Transient + @io.swagger.annotations.ApiModelProperty(value="权限列表",name="menus") private String menus; - - public String getMenus() { - return menus; - } - - public void setMenus(String menus) { - this.menus = menus; - } - - public String getTenantId() { - return tenantId; - } - public void setTenantId(String _tenantId) { - tenantId = _tenantId; - } - public String getName() { - return name; - } - public void setName(String _name) { - name = _name; - } - public String getAvailable() { - return available; - } - public void setAvailable(String _available) { - available = _available; - } - public String getDescription() { - return description; - } - public void setDescription(String _description) { - description = _description; - } - - public static enum Field {