From 896640d332027061fbb414e7d2ce25289f393e80 Mon Sep 17 00:00:00 2001
From: chenlw <874313221@qq.com>
Date: Mon, 19 Dec 2016 10:18:33 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=81=E7=A7=BB=E6=95=B0=E6=8D=AE=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/com/platform/service/impl/MoveDataServiceImpl.java b/src/com/platform/service/impl/MoveDataServiceImpl.java
index 017f77fc..c9c31a6e 100644
--- a/src/com/platform/service/impl/MoveDataServiceImpl.java
+++ b/src/com/platform/service/impl/MoveDataServiceImpl.java
@@ -218,7 +218,11 @@ public class MoveDataServiceImpl implements IMoveDataService {
 		//是正则迁移时：
 		if ("1".equals(dataMove.getCompleteStatus())) {
 			if(1 != removeservice.abortcopyFolder(dataMove.getDataPath(), makeDstPath(dataMove.getDstPath()))){
-				removeservice.deleteFolder(dataMove.getDstPath());
+				try{
+					removeservice.deleteFolder(dataMove.getDstPath());
+				}catch(Exception e){
+					log.error(e);
+				}
 			}
 		}
 		result = dataInfoMoveTmpDao.remove(dataMove.getId());
@@ -254,7 +258,8 @@ public class MoveDataServiceImpl implements IMoveDataService {
 		//去掉 最后 的     数字 +/ 符合
 		if (matcher2.find()) {
 			String removeStr = matcher2.group();
-			dstPath = dstPath.replace(removeStr, "");
+			removeStr.length();
+			dstPath = dstPath.substring(0, dstPath.length()-removeStr.length());
 		}
 		return dstPath;
 	}