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,",");