diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/relation/web/DesignerRelationShapeWeb.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/relation/web/DesignerRelationShapeWeb.java
index 8ff2d090..1e8627d3 100755
--- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/relation/web/DesignerRelationShapeWeb.java
+++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/relation/web/DesignerRelationShapeWeb.java
@@ -855,6 +855,25 @@ public class DesignerRelationShapeWeb extends ActionWeb {
 		return treeJson.toString();
 	}
 
+	/**
+	 * 获取第二级及其以下目录
+	 * by bzp 增加method方法  判断
+	 *
+	 * @param pid
+	 * @return
+	 */
+	public String getTwoNodeJson(String pid, String wsId, String method, String ruuid) {
+		List<PALRepositoryModel> coeProcessLevelModels = CoeProcessLevelDaoFacotory.createCoeProcessLevel().getCoeProcessLevelByPid(pid, wsId);
+		JSONArray jsonArray = new JSONArray();
+		for (int i = 0; i < coeProcessLevelModels.size(); i++) {
+			PALRepositoryModel coeProcessLevelModel = coeProcessLevelModels.get(i);
+			if (coeProcessLevelModel != null) {
+				JSONObject json = getJSon(coeProcessLevelModel);
+				jsonArray.add(json);
+			}
+		}
+		return jsonArray.toString();
+	}
 	/**
 	 * 获取第二级及其以下目录
 	 *
diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/util/CoeProcessLevelUtil.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/util/CoeProcessLevelUtil.java
index 933e6ba3..da7033e4 100755
--- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/util/CoeProcessLevelUtil.java
+++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/util/CoeProcessLevelUtil.java
@@ -703,7 +703,7 @@ public class CoeProcessLevelUtil {
 				//bybzp 如果图形是过程链图和BPMN图 则不复制流程绩效和角色
 				PALRepositoryModel model = PALRepositoryCache.getCache().get(uuId);
 				String methodId = model.getMethodId();
-				if("process.bpmn2,process.epc".contains(methodId) && "lcjx,role".contains(oldModel.getAttrId())){
+				if("process.bpmn2,process.epc".contains(methodId) && "Process_performance_metrics,role".contains(oldModel.getAttrId())){
 					continue;
 				}
 				//by bzp end
diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java
index 7d3f303f..79a3b125 100755
--- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java
+++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java
@@ -3180,7 +3180,7 @@ public class CoeProcessLevelWeb extends ActionWeb {
 	public void copyAttribute(String uuid) {
 		DesignerShapeRelationDao relationDao = new DesignerShapeRelationDao();
 		PALRepositoryPropertyDao palRepositoryPropertyDao = new PALRepositoryPropertyDao();
-		String querySql = String.format("SELECT * FROM APP_ACT_COE_PAL_SHAPE_RLAT where FILEID = '%s' and ATTRID='lcjx'", uuid);
+		String querySql = String.format("SELECT * FROM APP_ACT_COE_PAL_SHAPE_RLAT where FILEID = '%s' and ATTRID='Process_performance_metrics'", uuid);
 		List<DesignerShapeRelationModel> result = DBSql.query(querySql, relationDao.rowMapper());
 		Connection conn = DBSql.open();
 		for (DesignerShapeRelationModel designerShapeRelationModel : result) {
@@ -9030,8 +9030,8 @@ public class CoeProcessLevelWeb extends ActionWeb {
 		String L3 = null;
 		JSONArray pathArray = CoeProcessLevelUtil.getRepositoryPath(targetId);
 		String updateSql = "update APP_ACT_COE_PAL_PROP set PROPERTYVALUE ='%s' where PLID ='%s' and PROPERTYID='%s'";
-		String queryKpiSql = "select PROPERTYVALUE from APP_ACT_COE_PAL_PROP where PLID ='%s' and PROPERTYID='lcjx'";
-		String querySql = "SELECT * FROM APP_ACT_COE_PAL_SHAPE_RLAT where FILEID = '%s' and ATTRID='lcjx'";
+		String queryKpiSql = "select PROPERTYVALUE from APP_ACT_COE_PAL_PROP where PLID ='%s' and PROPERTYID='Process_performance_metrics'";
+		String querySql = "SELECT * FROM APP_ACT_COE_PAL_SHAPE_RLAT where FILEID = '%s' and ATTRID='Process_performance_metrics'";
 		for (int i = 1; i < pathArray.size(); i++) {
 			JSONObject tmp = pathArray.getJSONObject(i);
 			String name = tmp.getString("name");
@@ -9049,13 +9049,13 @@ public class CoeProcessLevelWeb extends ActionWeb {
 		for (PALRepositoryModel palRepositoryModel : sourceList) {
 			String id = palRepositoryModel.getId();
 			if (L1 != null) {
-				DBSql.update(String.format(updateSql, L1, id, "L1"));
+				DBSql.update(String.format(updateSql, L1, id, "Process_Architecture_L1"));
 			}
 			if (L2 != null) {
-				DBSql.update(String.format(updateSql, L2, id, "L2"));
+				DBSql.update(String.format(updateSql, L2, id, "Process_Architecture_L2"));
 			}
 			if (L3 != null) {
-				DBSql.update(String.format(updateSql, L3, id, "L3"));
+				DBSql.update(String.format(updateSql, L3, id, "Process_Architecture_L3"));
 			}
 			/**
 			 * 查看改流程是否关联流程绩效
diff --git a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.js b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.js
index 269ba796..69374804 100755
--- a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.js
+++ b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.js
@@ -3663,6 +3663,26 @@ function saveRelevanceShapesTODB(shapesObj, shapeId, shapeName, fileName,
 			relationShapeModelObject[shapeIdAttrId] = temp.relationShapeText;
 		}
 	}
+	//by bzp 校验角色和岗位不能同时选择
+    	if(objId == 'role' || objId == 'post'){
+    	    if(objId == 'role'){
+    	        //判断岗位
+    	        var tmp = $("input[objid='post']").val();
+    	        if(tmp.length > 0){
+    	            $.simpleAlert("不能同时选择岗位和角色");
+    	            return;
+    	        }
+    	    }
+    	    if(objId == 'post'){
+                //判断角色
+                var tmp = $("input[objid='role']").val();
+                if(tmp.length > 0){
+                    $.simpleAlert("不能同时选择岗位和角色");
+                    return;
+                }
+            }
+    	}
+    	//by bzp end
 	var ref = $("input[objid_shapeId='" + objId + "']").attr("ref");
 	$.ajax({
 		type : "POST",