diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java
index 9098f50..6f6fcb2 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java
@@ -25,7 +25,7 @@ import java.io.Serializable;
 @Entity
 //以子类table为准
 @javax.persistence.Inheritance(strategy=InheritanceType.TABLE_PER_CLASS)
-@JsonInclude(value = JsonInclude.Include.NON_EMPTY) //""或null属性不参加序列转换
+//@JsonInclude(value = JsonInclude.Include.NON_EMPTY) //""或null属性不参加序列转换
 public abstract class BaseBean implements Serializable {
 
     private static final long serialVersionUID = 1L;
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java
index c052dcc..025dfe9 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java
@@ -1,7 +1,5 @@
 package cn.estsh.i3plus.pojo.base.bean;
 
-import javafx.scene.text.Font;
-
 import java.util.HashMap;
 
 /**
@@ -41,13 +39,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 +112,7 @@ public class DdlPackBean {
      * @return
      */
     public String getPackedHqlAll(){
+        sb = new StringBuilder();
         if(hqlAppend != null){
             sb.append(hqlAppend);
         }
@@ -133,6 +130,7 @@ public class DdlPackBean {
      * @return
      */
     public String getPackedHql(){
+        sb = new StringBuilder();
         if(whereAppend != null){
             sb.append(whereAppend);
         }
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 c3faf6d..aab262f 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
@@ -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
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java
index 1225c80..1c75712 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java
@@ -56,7 +56,7 @@ public class WmsLocatePart extends BaseBean{
     @ApiParam(value = "是否生成领料单", example = "2")
     private Integer isGeneratePicklist;
 
-    public Double  getMix() {
+    public Double  getMin() {
         return this.min == null ? 0 : this.min;
     }