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,'
') - t += '' + value + ''; + if(obj.name == "作废人" && value.indexOf("注销")>0){ + t += '' + value + ''; + }else{ + t += '' + value + ''; + } t += ''; } }