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 4e34946..99bac14 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 @@ -49,8 +49,8 @@ public class CoreHqlPack { */ public static String packHqlIds(String columnName, String[] params){ StringBuffer result = new StringBuffer(); - - // 参数数组 [1,2,3] -> "1,2,3" + HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); HqlPack.getInPack(String.join(",", params), columnName, result); return result.toString(); } @@ -63,6 +63,8 @@ public class CoreHqlPack { */ public static String packHqlIds(String columnName, Long[] params){ StringBuffer result = new StringBuffer(); + HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); // 参数数组 [1,2,3] -> "1,2,3" HqlPack.getInPack(StringUtils.join(params,","),columnName,result); @@ -524,13 +526,13 @@ public class CoreHqlPack { DdlPackBean result = DdlPackBean.getDdlPackBean(user); DdlPreparedPack.getNumEqualPack(user.getUserStatus(),"userStatus",result); - DdlPreparedPack.getNumEqualPack(user.getDepartmentId(),"departmentId",result); +// DdlPreparedPack.getNumEqualPack(user.getDepartmentId(),"departmentId",result); DdlPreparedPack.getStringLikerPack(user.getUserLoginName(),"userLoginName",result); DdlPreparedPack.getStringLikerPack(user.getUserName(),"userName",result); DdlPreparedPack.getStringLikerPack(user.getUserEmail(),"userEmail",result); DdlPreparedPack.getStringLikerPack(user.getUserPhone(),"userPhone",result); - DdlPreparedPack.getStringEqualPack(user.getOrganizeCode(),"organizeCode",result); +// DdlPreparedPack.getStringEqualPack(user.getOrganizeCode(),"organizeCode",result); DdlPreparedPack.getInPackList(idList,"id",result); result.setOrderByStr(user.orderBy());