feature(数据资源同步bug修改): 数据资源同步bug修改

数据资源同步bug修改

dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/facade/DataResourceFacade.java

@@ -574,6 +574,7 @@ public class DataResourceFacade implements IDataResourceFacade
             childVo.setId(Joiner.on(ID_SEPARATOR).join(treeVo.getId(), childVo.getCode()));
             List<DataResourceTreeVo> cc = childVo.getChild();
             if(CollectionUtils.isNotEmpty(cc)){
+                childVo.setTreeNode(true);
                 count += getTotalCount(childVo);
             }else {
                 childVo.setTreeNode(false);

dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/service/sub/impl/DataClaServiceImpl.java

@@ -340,11 +340,13 @@ public class DataClaServiceImpl implements IDataClaService {
             String code = node.getCode();
             DataCla dataCla = getByCodeAndPath(code, path);
             if(dataCla == null) {
-                saveNodeAndChild(node, path, new Date());
+                String localPath = path;
+                saveNodeAndChild(node, localPath, new Date());
             } else {
+                String localPath = path;
                 updateNode(node, dataCla);
-                path = path == null? dataCla.getId():path + CommonCons.PATH_SEP + dataCla.getId();
-                sync(node.getChild(), path);
+                localPath = localPath == null? dataCla.getId():path + CommonCons.PATH_SEP + dataCla.getId();
+                sync(node.getChild(), localPath);
             }
         }
     }

dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/service/sub/impl/FieldClaServiceImpl.java

@@ -262,11 +262,13 @@ public class FieldClaServiceImpl implements IFieldClaService {
         for (DataResourceTreeVo node : nodes) {
             FieldCla fieldCla = getByCodeAndPath(node.getCode(), path);
             if(null == fieldCla) {
-                saveNodeAndChild(node, path, new Date());
+                String localPath = path;
+                saveNodeAndChild(node, localPath, new Date());
             } else {
+                String localPath = path;
                 updateNode(node, fieldCla);
-                path = path == null? fieldCla.getId():path + CommonCons.PATH_SEP + fieldCla.getId();
-                sync(node.getChild(), path);
+                localPath = localPath == null? fieldCla.getId():path + CommonCons.PATH_SEP + fieldCla.getId();
+                sync(node.getChild(), localPath);
             }
         }
     }
@@ -326,7 +328,8 @@ public class FieldClaServiceImpl implements IFieldClaService {
         List<DataResourceTreeVo> child = node.getChild();
         if(CollectionUtils.isNotEmpty(child)) {
             for (DataResourceTreeVo childNode : child) {
-                saveNodeAndChild(childNode, path, date);
+                String localPath = path;
+                saveNodeAndChild(childNode, localPath, date);
             }
         }
     }