Browse Source

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

linhuili 3 years ago
parent
commit
cd8a5b31f2

+ 4 - 0
src/main/java/com/persagy/proxy/adm/model/AdmBaseEntity.java

@@ -4,6 +4,7 @@ import com.persagy.dmp.common.model.entity.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -19,4 +20,7 @@ public abstract class AdmBaseEntity<T> extends BaseEntity {
     private Map<String, Object> infos;
     /** 集团编码 */
     private String groupCode;
+    /** 需要删除的对象 */
+    private List<String> nullList;
+
 }

+ 1 - 0
src/main/java/com/persagy/proxy/adm/utils/AdmEntityTransferUtil.java

@@ -47,6 +47,7 @@ public class AdmEntityTransferUtil {
                     String node = nullList.get(k).textValue();
                     if(node.startsWith("infos.")){
                         node = node.replace("infos.","");
+                        jsonNode.remove(node);
                         nullList.remove(i);
                         nullList.add(node);
                     }