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 641f8b3..3c28d85 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 @@ -98,14 +98,19 @@ public class CoreHqlPack { * @return */ public static DdlPackBean packHqlSysPosition(SysPosition position){ - DdlPackBean result = new DdlPackBean(); + return packHqlSysPosition(position,null); + } + public static DdlPackBean packHqlSysPosition(SysPosition position,List idList){ + DdlPackBean result = new DdlPackBean(); // 查询参数封装 DdlPreparedPack.getNumEqualPack(position.getParentId(),"parentId",result); - DdlPreparedPack.getStringEqualPack(position.getName(),"name",result); - DdlPreparedPack.getStringEqualPack(position.getPositionCode(),"positionCode",result); - DdlPreparedPack.getStringEqualPack(position.getOrganizeCode(),"organizeCode",result); + // String Like + DdlPreparedPack.getStringLikerPack(position.getName(),"name",result); + DdlPreparedPack.getStringLikerPack(position.getPositionCode(),"positionCode",result); + // In + DdlPreparedPack.getInPackList(idList,"id",result); return result; } @@ -217,6 +222,7 @@ public class CoreHqlPack { * @param role * @return */ + @Deprecated public static String packHqlSysRole(SysRole role){ StringBuffer result = new StringBuffer(); @@ -231,6 +237,27 @@ public class CoreHqlPack { } /** + * 系统角色复杂查询 + * @param role + * @return + */ + public static DdlPackBean packDdlBeanSysRole(SysRole role){ + return packDdlBeanSysRole(role,null); + } + + public static DdlPackBean packDdlBeanSysRole(SysRole role,List idList){ + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isValid",result); + DdlPreparedPack.getNumEqualPack(role.getRoleStatus(),"roleStatus",result); + DdlPreparedPack.getStringLikerPack(role.getName(),"name",result); + DdlPreparedPack.getInPackList(idList,"id",result); + + return result; + } + + /** * 系统参数复杂查询 * @param config * @return @@ -797,6 +824,19 @@ public class CoreHqlPack { return ddlPackBean; } + public static DdlPackBean packDdlBeanSysRefUserRole(SysRefUserRole ref){ + DdlPackBean result = new DdlPackBean(); + + // Number Eq + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isValid",result); + DdlPreparedPack.getNumEqualPack(ref.getUserId(),"userId",result); + // String Eq + DdlPreparedPack.getStringEqualPack(ref.getOrganizeCode(),"organizeCode",result); + + return result; + } + /** * 查询当前用户所有组织数据 * @param sysRefUserDepartments