Merge remote-tracking branch 'origin/test' into test

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

@@ -141,6 +141,14 @@ public abstract class BaseBean implements Serializable {
     //CommonEnumUtil.ASC_OR_DESC  1 asc,2 desc
     public transient Integer ascOrDesc = 1;
 
+    public int getIsValidVal() {
+        return this.isValid == null ? 0 : this.isValid.intValue();
+    }
+
+    public int getIsDeletedVal() {
+        return this.isDeleted == null ? 0 : this.isDeleted.intValue();
+    }
+
     //排序方式
     public String orderBy(){
         String result = "";

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

@@ -63,7 +63,23 @@ public class DdlPackBean {
 
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result);
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isValid",result);
-        DdlPreparedPack.getNumEqualPack(organizeCode,"organizeCode",result);
+        DdlPreparedPack.getStringEqualPack(organizeCode,"organizeCode",result);
+
+        return result;
+    }
+
+    /**
+     * 查询指定组织、指定是否有效的数据
+     * @param organizeCode
+     * @param isValid
+     * @return
+     */
+    public static DdlPackBean getDdlPackBean(String organizeCode, int isValid){
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result);
+        DdlPreparedPack.getNumEqualPack(isValid,"isValid",result);
+        DdlPreparedPack.getStringEqualPack(organizeCode,"organizeCode",result);
 
         return result;
     }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java

@@ -1093,7 +1093,7 @@ public class WmsEnumUtil {
             return valueOf(val);
         }
 
-        public static Integer descriptionOfValue(String desc) {
+        public static int descriptionOfValue(String desc) {
             return descOf(desc);
         }
 
@@ -1262,7 +1262,7 @@ public class WmsEnumUtil {
             return tmp;
         }
 
-        public static Integer descriptionOfValue(String desc) {
+        public static int descriptionOfValue(String desc) {
             return descOf(desc);
         }
         public static String valueOfDescription(int val) {

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java

@@ -2700,7 +2700,12 @@ public class MesHqlPack {
     }
 
     public static DdlPackBean getDataAuthCondition(MesDataAuth dataAuth, String organizeCode) {
-        DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
+        DdlPackBean packBean;
+        if(dataAuth.getIsValidVal() == 0) {
+            packBean = DdlPackBean.getDdlPackBean(organizeCode);
+        } else {
+            packBean = DdlPackBean.getDdlPackBean(organizeCode, dataAuth.getIsValidVal());
+        }
         if (!StringUtils.isEmpty(dataAuth.getDataObject())) {
             DdlPreparedPack.getStringLikerPack(dataAuth.getDataObject(), "dataObject", packBean);
         }