From 4fc2eca27b448ff3f01a9ea75de947497f6f8a8c Mon Sep 17 00:00:00 2001 From: dxfeng Date: Tue, 15 Nov 2022 11:47:54 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8A=B1=E5=90=8D=E5=86=8C=E6=A0=91=E3=80=81?= =?UTF-8?q?=E8=A7=92=E8=89=B2=E5=B1=95=E7=A4=BABUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/organization/entity/job/bo/JobBO.java | 2 +- src/com/engine/organization/transmethod/SystemTransMethod.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/engine/organization/entity/job/bo/JobBO.java b/src/com/engine/organization/entity/job/bo/JobBO.java index c1fb690b..b212c7b9 100644 --- a/src/com/engine/organization/entity/job/bo/JobBO.java +++ b/src/com/engine/organization/entity/job/bo/JobBO.java @@ -151,7 +151,7 @@ public class JobBO { return builderJobs.stream().map(item -> { SearchTree tree = new SearchTree(); tree.setCanClick(true); - tree.setCanceled(false); + tree.setCanceled(item.getForbiddenTag() != 0); tree.setIcon("icon-coms-content-o"); tree.setId(item.getId().toString()); tree.setIsParent(false); diff --git a/src/com/engine/organization/transmethod/SystemTransMethod.java b/src/com/engine/organization/transmethod/SystemTransMethod.java index 314b2547..bb2e4ca9 100644 --- a/src/com/engine/organization/transmethod/SystemTransMethod.java +++ b/src/com/engine/organization/transmethod/SystemTransMethod.java @@ -19,7 +19,7 @@ public class SystemTransMethod { List list = new ArrayList<>(); if (StringUtils.isNotBlank(roleIds)) { for (String roleId : roleIds.split(",")) { - list.add(rolesComInfo.getRolesname(roleId)); + list.add(rolesComInfo.getRolesRemark(roleId)); } } return StringUtils.join(list,",");