Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo

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 + "");
 		}

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();
     }