|
@@ -276,7 +276,7 @@ public class CustomFieldService extends ServiceImpl<CustomFieldMapper, CustomFie
|
|
|
AllCustomFieldVO allCustomFieldVO = allCustomFieldVOS.stream().filter(i -> i.getId().equals(item.getId()) && i.getType().equals(item.getTreeType())).findFirst().orElse(null);
|
|
AllCustomFieldVO allCustomFieldVO = allCustomFieldVOS.stream().filter(i -> i.getId().equals(item.getId()) && i.getType().equals(item.getTreeType())).findFirst().orElse(null);
|
|
|
if (allCustomFieldVO == null) {
|
|
if (allCustomFieldVO == null) {
|
|
|
allCustomFieldVO = new AllCustomFieldVO();
|
|
allCustomFieldVO = new AllCustomFieldVO();
|
|
|
- allCustomFieldVO.setId(item.getId());
|
|
|
|
|
|
|
+ allCustomFieldVO.setId(item.getFieldId());
|
|
|
allCustomFieldVO.setSysOrder(order);
|
|
allCustomFieldVO.setSysOrder(order);
|
|
|
//1产品类别，2产品，3技术分类，4自定义树
|
|
//1产品类别，2产品，3技术分类，4自定义树
|
|
|
switch (item.getTreeType()) {
|
|
switch (item.getTreeType()) {
|
zero