From d4cf015596442bd6a64c4329f22d7cec55ebe832 Mon Sep 17 00:00:00 2001
From: chenlw <874313221@qq.com>
Date: Sat, 8 Oct 2016 10:31:26 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=81=E7=A7=BB=E6=95=B0=E6=8D=AE=E7=9A=84?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E5=9C=A8=E5=8E=9F=E6=95=B0=E6=8D=AE=E8=B7=AF?=
 =?UTF-8?q?=E5=BE=84=E6=88=96=E8=80=85=E5=8E=9F=E6=95=B0=E6=8D=AE=E7=88=B6?=
 =?UTF-8?q?=E7=9B=AE=E5=BD=95=E5=8F=8A=E5=85=B6=E4=B8=8A=EF=BC=8C=E4=B8=8D?=
 =?UTF-8?q?=E5=85=81=E8=AE=B8=E8=BF=81=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/platform/service/impl/MoveDataServiceImpl.java | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/com/platform/service/impl/MoveDataServiceImpl.java b/src/com/platform/service/impl/MoveDataServiceImpl.java
index b3aca0e8..bd0facdb 100644
--- a/src/com/platform/service/impl/MoveDataServiceImpl.java
+++ b/src/com/platform/service/impl/MoveDataServiceImpl.java
@@ -103,15 +103,22 @@ public class MoveDataServiceImpl implements IMoveDataService {
 			}
 			List<DataInfoEntityMoveTmp> moveList = new ArrayList<DataInfoEntityMoveTmp>();
 			for (DataInfoEntity dataInfoEntity : data) {
+				//（根据迁移路径判断）存在迁移过的数据，不允许迁移，先必须删除记录
 				if (existIds.contains(dataInfoEntity.getDataPath())) {
 					continue;
 				}
+				// 数据的id不存在的数据不允许迁移
 				if (dataInfoEntity.getId() == 0) {
 					continue;
 				}
+				// （根据数据的id判断）存在迁移过的数据，不允许迁移，先必须删除记录
 				if (fkIds.contains(dataInfoEntity.getId())) {
 					continue;
 				}
+				// 迁移数据的位置在原数据路径或者原数据父目录及其上，不允许迁移
+				if (dataInfoEntity.getDataPath().contains(node.getPath())) {
+					continue;
+				}
 				// TODO 正则：取出 data 的后面 的 路径，eg: XXX/320198_16/1,or
 				// XXX/320122KFQ_15/1）
 				Matcher matcher = pattern.matcher(dataInfoEntity.getDataPath());