From 030ffc6ef5b4d83cce0f33a2b5912c3330306d04 Mon Sep 17 00:00:00 2001
From: zhal <15900249928@163.com>
Date: Tue, 26 Jul 2022 22:25:20 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E5=8F=B7=E7=94=9F=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../extend/js/designer.extend.link.js         | 42 ++++++++++---------
 1 file changed, 22 insertions(+), 20 deletions(-)

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 589a49cf..2e18cd98 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
@@ -3473,7 +3473,7 @@ function openRelationDig(obj,value) {
 		+ "&relationShapeIds=" + relationShapeIds
 		+ "&relationFileIds=" + relationFileIds
 		+ "&ruuid=" + ruuid);
-
+	debugger;
 	if(methodId=="org.role"){
 		//根据角色
 		$.ajax({
@@ -3541,6 +3541,7 @@ function openRelationDig(obj,value) {
 												methodId:methodId
 											},
 											success : function(msg) {
+
 												if (msg.data.result == "ok") {
 													window.top.$.simpleAlert("请勿重复新建角色模型!!!");
 												}else{
@@ -3558,7 +3559,7 @@ function openRelationDig(obj,value) {
 														},
 														success : function(msg) {
 															if (msg.result == "ok") {
-																window.open("./w?uuid=" + msg.data.uuid+"&teamId"
+																window.open("./w?uuid=" + msg.data.uuid+"&teamId="+$('#teamId').val()
 																	+ "&cmd=com.actionsoft.apps.coe.pal_pl_repository_designer&sid=" + encodeURIComponent($('#sid').val()));
 															}
 
@@ -3726,24 +3727,25 @@ function saveRelevanceShapesTODB(shapesObj, shapeId, shapeName, fileName,
 		}
 	}
 	//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;
-                }
-            }
-    	}
+			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({