From acb58c0185411f2658e23d6514c86bc6e8cdc063 Mon Sep 17 00:00:00 2001
From: zhal <15900249928@163.com>
Date: Fri, 7 Oct 2022 10:29:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E9=98=85=E8=A7=88=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repository/job/SynchronousPortJob.java    |  2 +-
 .../js/designer.extend.link.view.portal.js    | 16 +++++++++++++++
 ...designer.extend.link.view.portal.mobile.js | 20 ++++++++++++++++++-
 3 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/job/SynchronousPortJob.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/job/SynchronousPortJob.java
index 30f9e2e1..ef3c6e52 100644
--- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/job/SynchronousPortJob.java
+++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/job/SynchronousPortJob.java
@@ -88,7 +88,7 @@ public class SynchronousPortJob implements IJob {
 
         Connection open = DBSql.open();
         try {
-             orgdepartmentList = DBSql.getMaps(open, "select DEPARTMENTNAME,ID,LAYER,PARENTDEPARTMENTID,ORDERINDEX from ORGDEPARTMENT where Closed=0 ");
+             orgdepartmentList = DBSql.getMaps(open, "select DEPARTMENTNAME,ID,LAYER,PARENTDEPARTMENTID,ORDERINDEX from ORGDEPARTMENT where Closed=0  ");
 
 
             RowMap parentModel=DBSql.getMap("SELECT ID FROM APP_ACT_COE_PAL_REPOSITORY WHERE PLNAME='内蒙古伊利实业集团股份有限公司' and PLMETHODID='org.normal'");
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 ee9c7a1b..ebf18735 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
@@ -1470,6 +1470,16 @@ function initProcessDesc() {
 	var b='';
 	for(var i = 1; i <= length; i++) {
 		var obj = processDesc[i];
+
+		if(obj.name=="是否发布"){
+			continue;
+		}
+		if(obj.name=="ARIS地址"){
+			continue;
+		}
+		if(obj.name=="ARIS流程名称"){
+              continue;
+		}
 		//判断如果为相关文件/支持文件显示在右侧区域
 		if(obj.name=="相关文件" || obj.name=="支持文件"){
 			b += '<table  class="awsui-table">';
@@ -1487,6 +1497,12 @@ function initProcessDesc() {
 			}
 
 		}else{
+			if(obj.name=="前置流程"){
+				obj.name="上游";
+			}
+			if(obj.name=="后置流程"){
+				obj.name="下游";
+			}
 			t += '<tr class="borderbottom">';
 			t += '<td class="tableContent tableleft">' + "【"+obj.name +"】"+ '</td>';
 
diff --git a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.mobile.js b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.mobile.js
index e993d941..593c9f01 100644
--- a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.mobile.js
+++ b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.mobile.js
@@ -456,7 +456,6 @@ function openDialog(obj) {
 	$("#attribute-table-window2").dialog({
 		title: tableName,
 		draggable: true,
-		height:50,
 		buttons : [{
 			text : '确定',
 			cls : "blue",
@@ -1482,6 +1481,17 @@ function initProcessDesc() {
 	var b='';
 	for(var i = 1; i <= length; i++) {
 		var obj = processDesc[i];
+
+		if(obj.name=="是否发布"){
+			continue;
+		}
+		if(obj.name=="ARIS地址"){
+			continue;
+		}
+		if(obj.name=="ARIS流程名称"){
+			continue;
+		}
+
 		//判断如果为相关文件/支持文件显示在右侧区域
 		if(obj.name=="相关文件" || obj.name=="支持文件"){
 			b += '<table  class="awsui-table">';
@@ -1499,6 +1509,14 @@ function initProcessDesc() {
 			}
 
 		}else{
+
+			if(obj.name=="前置流程"){
+				obj.name="上游";
+			}
+			if(obj.name=="后置流程"){
+				obj.name="下游";
+			}
+
 			t += '<tr class="borderbottom">';
 			t += '<td class="tableContent tableleft">' + "【"+obj.name +"】"+ '</td>';