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 e373af9..ef26b09 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 @@ -73,26 +73,21 @@ public class CoreHqlPack { /** * 资源查询 - * @param localeResource + * @param resource * @return */ - public static String packHqlSysLocaleResource(SysLocaleResource localeResource){ - StringBuffer result = new StringBuffer(); - - //查询日期 -// HqlPack.timeBuilder(sysLocaleResource.getCreateDateTimeStart(),sysLocaleResource.getCreateDateTimeEnd(), -// "createDateTime", result, false); - //数字类型封装 - HqlPack.getNumEqualPack(localeResource.getResourceType(),"resourceType",result); - //字符串类型封装 - HqlPack.getStringEqualPack(localeResource.getLanguageCode(),"languageCode",result); - //字符串类型封装 - HqlPack.getStringLikerPack(localeResource.getResourceKey(),"resourceKey",result); + public static DdlPackBean packHqlSysLocaleResource(SysLocaleResource resource){ + DdlPackBean result = DdlPackBean.getDdlPackBean(); - // 添加默认排序 - HqlPack.getOrderDefault(localeResource); + if(resource != null){ + DdlPreparedPack.getNumEqualPack(resource.getResourceType(),"resourceType",result); + DdlPreparedPack.getNumEqualPack(resource.getIsSystem(),"isSystem",result); + DdlPreparedPack.getStringEqualPack(resource.getLanguageCode(),"languageCode",result); + DdlPreparedPack.getStringEqualPack(resource.getResourceKey(),"resourceKey",result); + DdlPreparedPack.getStringLikerPack(resource.getResourceValue(),"resourceValue",result); + } - return result.toString(); + return result; } /** @@ -265,6 +260,14 @@ public class CoreHqlPack { DdlPreparedPack.getStringLikerPack(menu.getMenuCode(),"menuCode",result); result.setOrderByStr(menu.orderBy()); + }else { + menu = new SysMenu(); + } + + if(!StringUtils.isNotBlank(menu.getOrderByParam())){ + menu.setOrderByParam("menuSort"); + menu.setAscOrDesc(CommonEnumUtil.ASC_OR_DESC.DESC.getValue()); + result.setOrderByStr(menu.orderBy()); } return result;