diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java index 9e20f3b..d9e3bb6 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java @@ -58,9 +58,9 @@ public class SysMenu extends BaseBean { } } - @Column(name="RED_PARENT_NAME") + @Column(name="PARENT_NAME_RDD") @ApiParam(value ="父级功能名称" , access ="父级功能名称") - private String redParentName; + private String parentNameRdd; @Column(name="MENU_CLASS_PATH") @ApiParam(value ="资源class path" , access ="资源class path") diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java index 8809d79..2df17b4 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java @@ -5,10 +5,12 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; +import javafx.scene.text.TextBoundsType; import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; +import org.hibernate.annotations.Type; import javax.persistence.Column; import javax.persistence.Entity; @@ -55,28 +57,28 @@ public class SysRole extends BaseBean { } } - @Column(name="RED_PARENT_NAME") + @Column(name="PARENT_NAME_RDD") @ApiParam(value ="角色父节点名称" , access ="角色父节点名称") - private String redParentName; + private String parentNameRdd; - @Column(name="RED_MODULE_NAMES") - @ApiParam(value ="权限模块名称" , access ="权限模块名称") - private String redModuleNames; - - @Column(name="RED_MODULE_NUMBER") + @Column(name="MODULE_NUMBER") @ApiParam(value ="权限模块数量" , example ="0" , access ="权限模块数量") - private Integer redModuleNumber; + private Integer moduleNumber; - @Column(name="RED_MENU_NAMES") - @ApiParam(value ="权限功能名称" , access ="权限功能名称") - private String redMenuNames; + @Column(name="MODULE_NAMES_RDD") + @ApiParam(value ="权限模块名称" , access ="权限模块名称") + private String moduleNamesRdd; - @Column(name="RED_MENU_NUMBER") + @Column(name="MENU_NUMBER_RDD") @ApiParam(value ="权限功能数量" , example ="0" , access ="权限功能数量") - private Integer redMenuNumber; + private Integer menuNumber; + + @Column(name="MENU_NAMES_RDD",columnDefinition="TEXT") + @ApiParam(value ="权限功能名称" , access ="权限功能名称") + private String menuNamesRdd; - @Column(name="ROLE_STATUS_ID") + @Column(name="ROLE_STATUS") @ApiParam(value ="角色状态(枚举:1.正常,2.状态)" , example ="-1") - private Integer roleStatusId; + private Integer roleStatus; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index 94a70b7..8d4cc6e 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -142,7 +142,7 @@ public class CoreHqlPack { StringBuffer result = new StringBuffer(); // 查询参数封装 - HqlPack.getNumEqualPack(role.getRoleStatusId(),"roleStatusId",result); + HqlPack.getNumEqualPack(role.getRoleStatus(),"roleStatus",result); HqlPack.getStringLikerPack(role.getName(),"name",result); return result.toString();