From df3ce4b57ea7f3cb827f39776d974dade0b932a0 Mon Sep 17 00:00:00 2001
From: yujh <yujh_java@163.com>
Date: Mon, 5 Aug 2024 14:39:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E5=BA=9F=E4=BA=BA=E5=B1=9E=E6=80=A7?=
 =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=B3=A8=E9=94=80=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=94=E9=A2=9C=E8=89=B2=E5=8F=98=E7=BA=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../coe/pal/pal/repository/util/CoeProcessLevelUtil.java    | 2 +-
 .../designer/extend/js/designer.extend.link.view.portal.js  | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

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 352c3374..5792d28c 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
@@ -1322,7 +1322,7 @@ public class CoeProcessLevelUtil {
 								if ("user".equals(object.getString("type"))) {
 									UserModel user = SDK.getORGAPI().getUser(object.getString("id"));
 									if (user != null && !filter.contains(user.getUID())) {
-										userValList.add(user.getUserName());
+										userValList.add(user.getUserName()+ (user.isClosed() == true?"(已注销)":""));
 										filter.add(user.getUID());
 									}
 								}
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 8faf409e..d8b7bc75 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
@@ -1534,7 +1534,11 @@ function initProcessDesc() {
                 }
             } else {
                 value = value.replace(/\n/g,'<br>')
-                t += '<td   class="tableContent tableright" >' + value + '</td>';
+                if(obj.name == "作废人" && value.indexOf("注销")>0){
+                    t += '<td   class="tableContent tableright" style="color:red" >' + value + '</td>';
+                }else{
+                    t += '<td   class="tableContent tableright" >' + value + '</td>';
+                }
                 t += '</tr>';
             }
         }