diff --git a/src/main/java/neatlogic/module/tenant/api/form/GetFormAttributeListApi.java b/src/main/java/neatlogic/module/tenant/api/form/GetFormAttributeListApi.java index 9cacd147e01f383695ca614d3fc1cbdd91a224d8..6c08605dddfc195de791c1e53e5795f9411eca97 100644 --- a/src/main/java/neatlogic/module/tenant/api/form/GetFormAttributeListApi.java +++ b/src/main/java/neatlogic/module/tenant/api/form/GetFormAttributeListApi.java @@ -62,7 +62,8 @@ public class GetFormAttributeListApi extends PrivateApiComponentBase { throw new FormNotFoundException(formUuid); } IFormCrossoverService formCrossoverService = CrossoverServiceFactory.getApi(IFormCrossoverService.class); - return formCrossoverService.getFormAttributeList(formUuid, form.getName(), tag); +// return formCrossoverService.getFormAttributeList(formUuid, form.getName(), tag); + return formCrossoverService.getFormAttributeListNew(formUuid, form.getName(), tag); } @Override diff --git a/src/main/java/neatlogic/module/tenant/api/form/ListFormTagApi.java b/src/main/java/neatlogic/module/tenant/api/form/ListFormTagApi.java index ff06ed119cd68eacfd1db0c06ed9abcedd00e019..8653aebe71064fe7634ad9ad5dcb048193e70118 100644 --- a/src/main/java/neatlogic/module/tenant/api/form/ListFormTagApi.java +++ b/src/main/java/neatlogic/module/tenant/api/form/ListFormTagApi.java @@ -77,12 +77,12 @@ public class ListFormTagApi extends PrivateApiComponentBase { throw new FormActiveVersionNotFoundExcepiton(form.getName()); } Set tagSet = new HashSet<>(); - List formExtendAttributeList = formVersionVo.getFormExtendAttributeList(); - if (CollectionUtils.isNotEmpty(formExtendAttributeList)) { - for (FormAttributeVo formAttributeVo : formExtendAttributeList) { - tagSet.add(formAttributeVo.getTag()); - } - } +// List formExtendAttributeList = formVersionVo.getFormExtendAttributeList(); +// if (CollectionUtils.isNotEmpty(formExtendAttributeList)) { +// for (FormAttributeVo formAttributeVo : formExtendAttributeList) { +// tagSet.add(formAttributeVo.getTag()); +// } +// } List formCustomExtendAttributeList = formVersionVo.getFormCustomExtendAttributeList(); if (CollectionUtils.isNotEmpty(formCustomExtendAttributeList)) { for (FormAttributeVo formAttributeVo : formCustomExtendAttributeList) {