From 804008410e5e2d57fab64c945a12a62d41b5522f Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Wed, 28 Nov 2018 16:23:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BB=A3=E7=A0=81=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java | 4 ++-- .../cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 11 ++++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java index ca6bba6..a108879 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java @@ -215,7 +215,7 @@ public class HqlPack { * @param result */ public static void getNumEqualPack(Object data,String columnName, StringBuffer result) { - if(data!=null&&Long.parseLong(data.toString()) > 0){ + if (data != null) { data = getSafeParam(data); result.append(" and model."+columnName+" = " + data + ""); } @@ -239,7 +239,7 @@ public class HqlPack { * @param result */ public static void getNumEqualPackForZero(Object data,String columnName, StringBuffer result) { - if(data!=null&&Long.parseLong(data.toString()) >= 0){ + if (data != null && Long.parseLong(data.toString()) >= 0) { data = getSafeParam(data); result.append(" and model."+columnName+" = " + data + ""); } 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 519c5f0..7e2a33c 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 @@ -121,12 +121,21 @@ public class CoreHqlPack { public static String packHqlSysDepartment(SysDepartment department){ StringBuffer result = new StringBuffer(); - // 查询参数封装 + if(department.getOrganizeId() != null && department.getOrganizeId() > 0){ + department.setParentId(CommonEnumUtil.PARENT.DEFAULT.getValue()); + } + HqlPack.getNumEqualPack(department.getParentId(),"parentId",result); HqlPack.getNumEqualPack(department.getOrganizeId(),"organizeId",result); HqlPack.getStringLikerPack(department.getName(),"name",result); HqlPack.getStringLikerPack(department.getDepartmentCode(),"departmentCode",result); + // 默认排序 + if(department.getOrderByParam().isEmpty()){ + department.setOrderByParam("departmentSort"); + department.setAscOrDesc(CommonEnumUtil.ASC_OR_DESC.DESC.getValue()); + } + return result.toString(); }