hql封装优化

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java

@@ -41,13 +41,11 @@ public class DdlPackBean {
 
     public DdlPackBean(){
         this.isHql = true;
-        sb = new StringBuilder();
         whereAppend = new StringBuilder();
     }
 
     public DdlPackBean(boolean isHql){
         this.isHql = isHql;
-        sb = new StringBuilder();
         whereAppend = new StringBuilder();
     }
 
@@ -116,6 +114,7 @@ public class DdlPackBean {
      * @return
      */
     public String getPackedHqlAll(){
+        sb = new StringBuilder();
         if(hqlAppend != null){
             sb.append(hqlAppend);
         }
@@ -133,6 +132,7 @@ public class DdlPackBean {
      * @return
      */
     public String getPackedHql(){
+        sb = new StringBuilder();
         if(whereAppend != null){
             sb.append(whereAppend);
         }

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java

@@ -400,6 +400,40 @@ public class CoreHqlPack {
     }
 
     /**
+     * 账号复杂查询
+     * @param user
+     * @return
+     */
+    public static DdlPackBean packDdlSysUser(SysUser user){
+        DdlPackBean ddlPack = new DdlPackBean();
+
+        // And X = X
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",ddlPack);
+        DdlPreparedPack.getNumEqualPack(user.getDepartmentId(),"departmentId",ddlPack);
+        DdlPreparedPack.getNumEqualPack(user.getUserStatus(),"userStatus",ddlPack);
+
+        if(user.getRoleIdList() != null){
+            DdlPreparedPack.getInPack(user.getRoleIdList(),"id",ddlPack);
+        }
+
+        if(user.getDepartmentIdList() != null){
+            DdlPreparedPack.getInPack(user.getDepartmentIdList(),"id",ddlPack);
+        }
+
+        // And Like % %
+        DdlPreparedPack.getStringLikerPack(user.getUserName(),"userName",ddlPack);
+        DdlPreparedPack.getStringLikerPack(user.getUserLoginName(),"userLoginName",ddlPack);
+        DdlPreparedPack.getStringLikerPack(user.getUserEmail(),"userEmail",ddlPack);
+        DdlPreparedPack.getStringLikerPack(user.getUserPhone(),"userPhone",ddlPack);
+
+        // 添加默认排序
+        DdlPreparedPack.getOrderDefault(user);
+        DdlPreparedPack.getOrderByPack(new Object[]{1}, new String[]{"createDatetime"}, ddlPack);
+
+        return  ddlPack;
+    }
+
+    /**
      * 查询字典代码是否重复
      * @param dictionary
      * @return