diff --git a/project/src/main/java/com/sdm/project/service/impl/DemandServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/DemandServiceImpl.java index 56d9e2e3..64032049 100644 --- a/project/src/main/java/com/sdm/project/service/impl/DemandServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/DemandServiceImpl.java @@ -617,13 +617,15 @@ public class DemandServiceImpl extends BaseService implements IDemandService { // if (CollectionUtils.isNotEmpty(tag1)) { // tag1.get(tag1.size() - 1); // } - List tagListProperty; + String tagListProperty; String lastNodeId = ""; for (int i = 1; i <= 10; i++) { try { tagListProperty = getTagListProperty(taskNode, "tag" + i); - if (CollectionUtils.isNotEmpty(tagListProperty)) { - lastNodeId = tagListProperty.get(tagListProperty.size() - 1); + if (StringUtils.isNotBlank(tagListProperty)) { +// lastNodeId = tagListProperty.get(tagListProperty.size() - 1); + String[] lastNodeIdArr = tagListProperty.split(","); + lastNodeId = lastNodeIdArr[lastNodeIdArr.length - 1]; } } catch (Exception e) { throw new RuntimeException(e); diff --git a/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java index 21a6a76c..44edc358 100644 --- a/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java @@ -765,11 +765,11 @@ public class NodeServiceImpl extends ServiceImpl getTagListProperty(Object obj, String propertyName) throws Exception { + public static String getTagListProperty(Object obj, String propertyName) throws Exception { Class clazz = obj.getClass(); Field field = clazz.getDeclaredField(propertyName); field.setAccessible(true); - return (List) field.get(obj); + return (String) field.get(obj); } @Override @@ -1175,7 +1175,7 @@ public class NodeServiceImpl extends ServiceImpl tagListProperty; + String tagListProperty; for (int i = 1; i <= 10; i++) { try { tagListProperty = getTagListProperty(parentNode, "tag" + i); - if (CollectionUtils.isEmpty(tagListProperty)) { + if (StringUtils.isBlank(tagListProperty)) { continue; } setTagProperty(addNode, "tag" + i, tagListProperty); @@ -1237,7 +1237,8 @@ public class NodeServiceImpl extends ServiceImpl tagListProperty; + String tagListProperty; for (int i = 1; i <= 10; i++) { try { tagListProperty = getTagListProperty(parentNode, "tag" + i); - if (CollectionUtils.isEmpty(tagListProperty)) { + if (StringUtils.isBlank(tagListProperty)) { continue; } setTagProperty(addNode, "tag" + i, tagListProperty);