瀏覽代碼

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

linhuili 3 年之前
父節點
當前提交
9e25e8241c
共有 1 個文件被更改,包括 3 次插入0 次删除
  1. 3 0
      src/main/java/com/persagy/proxy/adm/utils/AdmEntityTransferUtil.java

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

@@ -119,6 +119,9 @@ public class AdmEntityTransferUtil {
         if(CollUtil.isNotEmpty(projection)) {
             // 转换为Set,提供遍历效率
             Set<String> fieldSet = CollUtil.newHashSet(projection);
+            if(fieldSet.contains("localID")){//兼容adm前端数据
+                fieldSet.add("localId");
+            }
             Iterator<String> fields =  dmpData.fieldNames();
             while (fields.hasNext()) {
                 String field = fields.next();