整理方法

ibiz-boot-starter/src/main/java/net/ibizsys/central/plugin/boot/core/domain/BaseData.java

@@ -2,6 +2,7 @@ package net.ibizsys.central.plugin.boot.core.domain;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.alibaba.fastjson.util.TypeUtils;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonAnySetter;
 import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -39,10 +40,14 @@ public class BaseData  implements IEntityDTO  {
 
     @JsonIgnore
     @JSONField(serialize = false)
+    @TableField(exist = false)
+    @Transient
     private transient IDEMethodDTORuntime iDEMethodDTORuntime = null;
 
     @JsonIgnore
     @JSONField(serialize = false)
+    @TableField(exist = false)
+    @Transient
     private boolean actionInputDTO = false;
 
     public void setActionInputDTO(Boolean actionInputDTO)
@@ -52,6 +57,8 @@ public class BaseData  implements IEntityDTO  {
 
     @JsonIgnore
     @JSONField(serialize = false)
+    @TableField(exist = false)
+    @Transient
     private boolean enableAny = false;
 
     public void setEnableAny(Boolean enableAny)
@@ -104,6 +111,8 @@ public class BaseData  implements IEntityDTO  {
 
     @JsonIgnore
     @JSONField(serialize = false)
+    @TableField(exist = false)
+    @Transient
     private Set<String> focusNull=new HashSet<>();
 
     public void setFocusNull(Set<String> focusNull)
@@ -144,6 +153,8 @@ public class BaseData  implements IEntityDTO  {
 
     @JsonIgnore
     @JSONField(serialize = false)
+    @TableField(exist = false)
+    @Transient
     private Map<String,Object> paramMap=new HashMap<String,Object>();
 
     public void setParamMap(Map<String,Object> paramMap)
@@ -162,6 +173,8 @@ public class BaseData  implements IEntityDTO  {
 
     @JsonIgnore
     @JSONField(serialize = false)
+    @TableField(exist = false)
+    @Transient
     private transient Map<String , Object> _allParamMap=null;
 
     @JsonIgnore
@@ -182,6 +195,7 @@ public class BaseData  implements IEntityDTO  {
     @JsonIgnore
     @JSONField(serialize = false)
     @Transient
+    @TableField(exist = false)
     private BeanMap map;
 
     @JsonIgnore

ibiz-boot-starter/src/main/java/net/ibizsys/central/plugin/boot/core/filter/BaseFilter.java

@@ -29,6 +29,7 @@ import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 
 import java.util.ArrayList;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -72,7 +73,18 @@ public class BaseFilter<T> extends BaseData implements ISearchContextDTO {
         this.iDEFilterDTORuntime = (IDEFilterDTORuntime)iDEMethodDTORuntime;
         if (objData instanceof Map) {
             Map<String,Object> map = (Map<String,Object>)objData;
-            this.setAny(map, true);
+
+            for(java.util.Map.Entry<String, Object> entry : map.entrySet()) {
+                if(entry.getKey().equalsIgnoreCase("searchconds")&&(!ObjectUtils.isEmpty(entry.getValue())))
+                {
+                    List list=(List)entry.getValue();
+                    if(!(list.get(0) instanceof ISearchCond))
+                        continue;
+                }
+
+                this.setObject(entry.getKey(), entry.getValue());
+            }
+
         }
         onInit();
     }
@@ -152,12 +164,14 @@ public class BaseFilter<T> extends BaseData implements ISearchContextDTO {
         else {
             //实际展开条件
             if(objSearchConds instanceof List) {
-                List list = (List)objSearchConds;
-                for(Object objItem : list) {
+                List list = new ArrayList();
+                ((List) objSearchConds).forEach(objItem->{
                     if(!(objItem instanceof Map)) {
-                        continue;
+                        return;
                     }
-
+                    list.add(objItem);
+                });
+                for(Object objItem : list) {
                     ISearchCond iSearchCond = net.ibizsys.central.util.SearchGroupCond.getSearchCond((Map)objItem, true);
                     if(iSearchCond != null) {
                         this.getSearchCondsIf().add(iSearchCond);
@@ -471,6 +485,10 @@ public class BaseFilter<T> extends BaseData implements ISearchContextDTO {
 
     public String query;
 
+    public void setQuery() {
+
+    }
+
 
     @Override
     @JsonIgnore