|
@@ -9,6 +9,7 @@ import com.fasterxml.jackson.databind.node.JsonNodeFactory;
|
|
import com.fasterxml.jackson.databind.node.ObjectNode;
|
|
import com.fasterxml.jackson.databind.node.ObjectNode;
|
|
import com.persagy.dmp.basic.model.QueryCriteria;
|
|
import com.persagy.dmp.basic.model.QueryCriteria;
|
|
import com.persagy.dmp.basic.utils.JsonNodeUtils;
|
|
import com.persagy.dmp.basic.utils.JsonNodeUtils;
|
|
|
|
+import com.persagy.dmp.digital.entity.ObjectDigital;
|
|
import com.persagy.proxy.adm.constant.AdmDictConstant;
|
|
import com.persagy.proxy.adm.constant.AdmDictConstant;
|
|
import com.persagy.proxy.adm.request.*;
|
|
import com.persagy.proxy.adm.request.*;
|
|
import com.persagy.proxy.adm.service.IAdmRelationService;
|
|
import com.persagy.proxy.adm.service.IAdmRelationService;
|
|
@@ -128,6 +129,7 @@ public class AdmSpaceController {
|
|
return AdmResponse.success(new ArrayList<>());
|
|
return AdmResponse.success(new ArrayList<>());
|
|
}
|
|
}
|
|
Map<String, Field> fieldMap = JsonNodeUtils.getFieldMap(AdmSpace.class);
|
|
Map<String, Field> fieldMap = JsonNodeUtils.getFieldMap(AdmSpace.class);
|
|
|
|
+ Map<String, Field> objFieldMap = JsonNodeUtils.getFieldMap(ObjectDigital.class);
|
|
Set<String> fields = fieldMap.keySet();
|
|
Set<String> fields = fieldMap.keySet();
|
|
for (AdmSpace space : vos) {
|
|
for (AdmSpace space : vos) {
|
|
Map<String, Object> infos = space.getInfos();
|
|
Map<String, Object> infos = space.getInfos();
|
|
@@ -137,7 +139,8 @@ public class AdmSpaceController {
|
|
Set<String> mapKeys = infos.keySet();
|
|
Set<String> mapKeys = infos.keySet();
|
|
for (String mapKey : mapKeys) {
|
|
for (String mapKey : mapKeys) {
|
|
if ((AdmDictConstant.TABLE_INFOS.contains(mapKey)
|
|
if ((AdmDictConstant.TABLE_INFOS.contains(mapKey)
|
|
- && !AdmDictConstant.HEIGHT.equals(mapKey))
|
|
|
|
|
|
+ && !AdmDictConstant.HEIGHT.equals(mapKey)
|
|
|
|
+ && objFieldMap.containsKey(mapKey))
|
|
|| AdmDictConstant.PIC.equals(mapKey)){
|
|
|| AdmDictConstant.PIC.equals(mapKey)){
|
|
// 这些信息就算在infos也不更新,
|
|
// 这些信息就算在infos也不更新,
|
|
// 和com.persagy.proxy.dictionary.service.impl.AbstractAdmDictBaseServiceImpl.handleObjectInfoPath
|
|
// 和com.persagy.proxy.dictionary.service.impl.AbstractAdmDictBaseServiceImpl.handleObjectInfoPath
|