From ed53d164adc8744934d53f2bd9ac640954d78ba3 Mon Sep 17 00:00:00 2001
From: zhal <15900249928@163.com>
Date: Fri, 22 Jul 2022 14:01:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B5=81=E7=A8=8B=E6=89=8B?=
 =?UTF-8?q?=E5=86=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pal/repository/job/SynchronousOrgJob.java |  7 +---
 .../repository/util/CoeProcessLevelUtil.java  | 11 ++++--
 ...al.pl.repository.designer.view.portal.html |  4 +--
 .../js/designer.extend.link.view.portal.js    | 34 ++++++++++++++++---
 4 files changed, 42 insertions(+), 14 deletions(-)

diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/job/SynchronousOrgJob.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/job/SynchronousOrgJob.java
index d149a88e..2862fe1d 100644
--- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/job/SynchronousOrgJob.java
+++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/job/SynchronousOrgJob.java
@@ -72,8 +72,7 @@ public class SynchronousOrgJob implements IJob {
 
         Connection open = DBSql.open();
         try {
-
-            orgdepartmentList = DBSql.getMaps(open, "select DEPARTMENTNAME,ID,LAYER,PARENTDEPARTMENTID,ORDERINDEX from ORGDEPARTMENT");
+            orgdepartmentList = DBSql.getMaps(open, "select DEPARTMENTNAME,ID,LAYER,PARENTDEPARTMENTID,ORDERINDEX from ORGDEPARTMENT where Closed=0 ");
 
             PALRepositoryModelImpl model = CoeProcessLevelUtil.createPALRepositoryModel(id1, plRid1, wsId, "内蒙古伊利实业集团股份有限公司",
                     "", orderIndex, modeldefaultId, "org", true, 1,
@@ -230,10 +229,6 @@ public class SynchronousOrgJob implements IJob {
         //拿到基础结构
         JSONObject shape = ShapeUtil.getProcessShapeDefinitionByName("org.normal", "position");
 
-        if (StringUtils.isNotEmpty(definition.getString("commonShapeConfig"))) {
-            definition.remove("commonShapeConfig");
-        }
-
 
         List<RowMap> orgdepartmentList = DBSql.getMaps(conn, "select DISTINCT(POSITION_NAME) from ORGUSER WHERE DEPARTMENTID=?", departmentId);
 
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 dcf59bee..0a41f536 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
@@ -2268,9 +2268,13 @@ public class CoeProcessLevelUtil {
 
 						String sessionId = new SSOUtil().registerClientSessionNoPassword(plModel.getCreateUser(), LoginConst.DEFAULT_LANG, "localhost", LoginConst.DEVICE_PC);
 
+						String relationFileId;
 						if(JSONObject.parseObject(property.getPropertyValue())!=null){
-							String relationFileId = JSONObject.parseObject(property.getPropertyValue()).get("relationFileId").toString();
-							//String url=SDK.getPortalAPI().getPortalUrl()+"/r/w?uuid="+relationFileId+"&teamId=&cmd=com.actionsoft.apps.coe.pal_pl_repository_designer&sid="+sessionId+"";
+							 relationFileId = JSONObject.parseObject(property.getPropertyValue()).get("relationFileId").toString();
+							if(relationFileId.contains(",")){
+								String[] spiltRelationFileId=relationFileId.split(",");
+								relationFileId=spiltRelationFileId[0];
+							}
 
 							PALRepositoryModel model = PALRepositoryCache.getCache().get(uuid);
 
@@ -2280,6 +2284,8 @@ public class CoeProcessLevelUtil {
 									taskId=getLastPublishTaskIdByModelId(model.getId());
 								}
 							}
+							System.out.println("taskID==========="+taskId);
+
 							String url=SDK.getPortalAPI().getPortalUrl()+"/r/w?cmd=com.actionsoft.apps.coe.pal.publisher_publish_file_open&uuid="+relationFileId+""+"&sid="+sessionId+"&taskId="+taskId;
 
 							//判断如果关联属性是岗位，多个岗位显示为...
@@ -2292,6 +2298,7 @@ public class CoeProcessLevelUtil {
 								}
 							}
 							appUrl="<a href='"+url+"' style='color:blue' target='_blank'>"+inputValue+"</a>";
+							System.out.println("appurl==============="+appUrl);
 							attribute.put("value", appUrl);
 						}
 					}else{
diff --git a/com.actionsoft.apps.coe.pal/template/page/pal.pl.repository.designer.view.portal.html b/com.actionsoft.apps.coe.pal/template/page/pal.pl.repository.designer.view.portal.html
index ecf40954..629ed475 100755
--- a/com.actionsoft.apps.coe.pal/template/page/pal.pl.repository.designer.view.portal.html
+++ b/com.actionsoft.apps.coe.pal/template/page/pal.pl.repository.designer.view.portal.html
@@ -816,7 +816,7 @@
         <span class="newadd_title"><#toolbarName></span>
     </div>
     <div class="newadd_card">
-        <div class="title"><span><#typeName></span></div>
+        <div class="title"></div>
         <div id="designer_layout" class="" >
             <div id="canvas_container" style="padding:0px;background-color:white;">
                 <div id="designer_canvas" style="background-color: white !important;">
@@ -864,7 +864,7 @@
                 <div id="tab" style="display: none;font-size: 17px;">
                     <div id="processDesc" class="headerTab" onclick="clickTab('processDesc');">流程属性</div>
                     <div id="processAttr" class="headerTab" onclick="clickTab('processAttr');">活动属性</div>
-                    <div id="processFiledown" class="headerTab" onclick="clickTab('processFile');">文件下载</div>
+                    <div id="processFile" class="headerTab" onclick="clickTab('processFile');">文件下载</div>
                 </div>
                 <!-- <div style="display: inline-block;float:right;">
                      <span class="awsui-iconfont" id="closeTab" style="color:#A9A9A9;" awsui-qtip="隐藏属性" onclick="tabOperate('close');">&gt;&gt;</span>
diff --git a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.js b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.js
index 2734d586..33edad6c 100755
--- a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.js
+++ b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.js
@@ -1495,11 +1495,12 @@ function initProcessDesc() {
 }
 
 function autoClickAttr() {
-
+     debugger;
 	// 属性自动切换
 	if ($('#openTab').is(':hidden')) {
 		var name = '';
 		if (Utils.getSelected()[0] == null) {
+		    debugger;
 			name = 'processDesc';
 		} else {
 			name = 'processAttr';
@@ -1535,7 +1536,6 @@ function dockShowView(name) {
 
 // 点击页面时变更显示内容
 function changeArributeByShape() {
-
 	if(!isClickTab) {
 		autoClickAttr();
 	}
@@ -1574,7 +1574,8 @@ function ProcessManual() {
 	t += '<table  class="awsui-table">';
 	t += '<tr><td>';
 	t += '<div class="filetableHeader"><i class="awsui-iconfont" style="color: #999999;margin-top: 2px;">&#xe7cf;</i> 流程手册：</div>';
-	t += '<div class="tableContent"><a href="javascript:void(0);" onclick="downloadProcessFile(\''+ taskId +'\')">'+ fileName +'</a></div>';
+	t += '<div class="tableContent"><a href="javascript:void(0);" onclick="openOutputFile(\''+ taskId +'\')">'+ fileName +'</a></div>';
+	t += '<i class="awsui-iconfont" style="color: #999999;margin-top: 2px;" onclick="downloadProcessFile(\''+taskId+'\')">&#xe653;</i>';
 	t += '</td></tr>';
 	t += '</table>';
 	$('#processFileDock').append(t);
@@ -1582,6 +1583,32 @@ function ProcessManual() {
 }
 
 
+function openOutputFile(taskId) {
+	// 打开流程手册
+	$.simpleAlert('正在打开', 'loading');
+	$.ajax({
+		type : "POST",
+		url : "./jd?sid=" + sid
+			+ "&cmd=com.actionsoft.apps.coe.pal_outputreport_output_process_preview",
+		data : {
+			taskId : taskId
+		},
+		success : function(msg) {
+			if (msg.result == "ok") {
+				$.simpleAlert("close");
+				if (msg['data']) {
+					var url = msg['data']['url'];
+					window.open(url);
+				}
+			} else {
+				$.simpleAlert("close");
+				$.simpleAlert(msg['msg'], 'info');
+			}
+		}
+	});
+}
+
+
 function  downloadProcessFile(taskId) {
 	$.ajax({
 		type : "POST",
@@ -1591,7 +1618,6 @@ function  downloadProcessFile(taskId) {
 			taskId : taskId
 		},
 		success : function(msg) {
-			debugger;
 			if (msg.result == "ok") {
 				window.location.href = msg.data.url;
 			}