diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index e312525..709d90a 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -223,9 +223,7 @@ public class CommonEnumUtil { EXCEPTION_DETAIL(3, "异常明细"), EXCEPTION_SOLUTION(4, "解决方案"), ENUM(5, "枚举"), - MODULE(10, "模块"), - METHOD(11, "功能"), - BUTTON(12, "按钮"), + MENU(10, "功能权限"), WEB(13, "前端"); private int value; @@ -597,6 +595,15 @@ public class CommonEnumUtil { return tmp; } + public static METHOD_LEVEL get(int id){ + for (int i = 0; i < values().length; i++) { + if (values()[i].value == id) { + return values()[i]; + } + } + return null; + } + public static int descOf(String desc) { int tmp = 1; for (int i = 0; i < values().length; i++) { 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 f9e9067..95deac5 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 @@ -50,7 +50,8 @@ public class SysMenu extends BaseBean { * 产品类型暂时不能填写, 产品以上线调整影响范围太大. */ @Column(name="SOFT_TYPE") - @ApiParam(value ="产品类型", example = "0") + @ApiParam(value ="产品类型", example = "0",access = "softTyp DOC: http://doc.estsh.com/docs/i3plus_api/i3plus_api-impp") + @AnnoOutputColumn private Integer softTyp; @Column(name="MENU_TYPE") 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 99bac14..e373af9 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 @@ -257,22 +257,15 @@ public class CoreHqlPack { DdlPackBean result = DdlPackBean.getDdlPackBean(menu); DdlPreparedPack.getInPackList(idList,"id",result); - DdlPreparedPack.getNumEqualPack(menu.getParentId(),"parentId",result); - DdlPreparedPack.getNumEqualPack(menu.getMenuType(),"menuType",result); - DdlPreparedPack.getNumEqualPack(menu.getMenuStatus(),"menuStatus",result); - DdlPreparedPack.getStringLikerPack(menu.getName(),"name",result); - DdlPreparedPack.getStringLikerPack(menu.getMenuCode(),"menuCode",result); - - result.setOrderByStr(menu.orderBy()); - - return result; - } - - public static DdlPackBean packDdlBeanSysMenu(SysMenu menu){ - - DdlPackBean result = DdlPackBean.getDdlPackBean(menu); - DdlPreparedPack.getNumEqualPack(menu.getMenuStatus(),"menuStatus",result); - result.setOrderByStr(menu.orderBy()); + if(menu != null){ + DdlPreparedPack.getNumEqualPack(menu.getParentId(),"parentId",result); + DdlPreparedPack.getNumEqualPack(menu.getMenuType(),"menuType",result); + DdlPreparedPack.getNumEqualPack(menu.getMenuStatus(),"menuStatus",result); + DdlPreparedPack.getStringLikerPack(menu.getName(),"name",result); + DdlPreparedPack.getStringLikerPack(menu.getMenuCode(),"menuCode",result); + + result.setOrderByStr(menu.orderBy()); + } return result; }