diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/dao/PALRepository.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/dao/PALRepository.java
index 4f2bf11e..a0ae604c 100755
--- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/dao/PALRepository.java
+++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/dao/PALRepository.java
@@ -3282,7 +3282,7 @@ public class PALRepository extends DaoObject<PALRepositoryModel> {
 
 	/**
 	 * 获得已发布的流程
-	 * 
+	 *
 	 * @param wsId
 	 * @return
 	 */
@@ -3291,6 +3291,20 @@ public class PALRepository extends DaoObject<PALRepositoryModel> {
 		return DBSql.query(sql, new PALRespositoryModelMapper());
 	}
 
+
+
+
+	/**
+	 * 获得已发布的流程(停用版本过滤架构图)
+	 *
+	 * @param wsId
+	 * @return
+	 */
+	public List<PALRepositoryModel> getPublishedRepositoryListByStop(String wsId) {
+		String sql = "select * from APP_ACT_COE_PAL_REPOSITORY where ISPUBLISH = 1 and WSID = '" + wsId + "' and PLMETHODID!='process.evc' order by PLLEVEL asc, PLORDERINDEX asc";
+		return DBSql.query(sql, new PALRespositoryModelMapper());
+	}
+
 	/**
 	 * 获取某个流程的所有子流程
 	 * 
diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/dao/PALRepositoryRemoveInfo.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/dao/PALRepositoryRemoveInfo.java
index ceb8124d..ee9184b6 100755
--- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/dao/PALRepositoryRemoveInfo.java
+++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/dao/PALRepositoryRemoveInfo.java
@@ -4,11 +4,7 @@ import java.sql.Connection;
 import java.sql.DatabaseMetaData;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 import com.actionsoft.apps.coe.pal.system.util.StringUtil;
 import com.actionsoft.bpms.commons.database.RowMapper;
@@ -25,6 +21,7 @@ import com.actionsoft.apps.coe.pal.pal.repository.model.PALRepositoryRemoveInfoM
 import com.actionsoft.apps.coe.pal.pal.repository.model.PALRepositoryRemoveModel;
 import com.actionsoft.apps.coe.pal.pal.repository.model.impl.PALRepositoryModelImpl;
 import com.actionsoft.exception.AWSDataAccessException;
+import jodd.util.StringPool;
 
 public class PALRepositoryRemoveInfo extends DaoObject<PALRepositoryRemoveInfoModel> {
 
@@ -201,7 +198,10 @@ public class PALRepositoryRemoveInfo extends DaoObject<PALRepositoryRemoveInfoMo
 			param.put("WSID", wsId);
 		}
 		if (UtilString.isNotEmpty(versionIdsSql)) {
-			sql.append(" and r.PLVERSIONID in (" + versionIdsSql + ")");
+			List<String> list = Arrays.asList(versionIdsSql.split(StringPool.COMMA));
+            sql.append(" and " + getAppendOrAndInString(list));
+			//sql.append(" and r.PLVERSIONID in (" + versionIdsSql + ")");
+
 		}
 		if (UtilString.isNotEmpty(searchInput)) {
 			String namelike = "";
@@ -216,6 +216,45 @@ public class PALRepositoryRemoveInfo extends DaoObject<PALRepositoryRemoveInfoMo
 		return DBSql.getInt(sql.toString(), "totalCount", param);
 	}
 
+
+
+
+	private static String getAppendOrAndInString(List<String> list){
+		StringBuffer sb=new StringBuffer();
+		String returnString="";
+		if(list.size()==0||null==list) {
+			returnString = sb.append("r.PLVERSIONID").append("=''").toString();
+		}
+		for(int i=0;i<list.size();i++){
+			if(i==0){
+				sb.append("r.PLVERSIONID");
+				sb.append(" in (");
+			}
+			sb.append(list.get(i).toString());
+			if(i>=900&&i<list.size()-1){
+				if(i%900==0){
+					sb.append(") or ");
+					sb.append("r.PLVERSIONID");
+					sb.append(" in (");
+				}else{
+					sb.append(",");
+				}
+			}else{
+				if(i<list.size()-1){
+					sb.append(",");
+				}
+			}
+			if(i==list.size()-1){
+				sb.append(")");
+			}
+		}
+		returnString=sb.toString();
+		return returnString;
+	}
+
+
+
+
 	/**
 	 * 分页模糊匹配
 	 * @param start