From d236127f31eef4201fdd14a0c46010ed3423173a Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Fri, 11 Nov 2022 16:52:01 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/表结构SQL/Oracle.sql | 4 ++-- .../service/impl/HrmPersonnelCardServiceImpl.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/表结构SQL/Oracle.sql b/docs/表结构SQL/Oracle.sql index 680d7e43..c57283b3 100644 --- a/docs/表结构SQL/Oracle.sql +++ b/docs/表结构SQL/Oracle.sql @@ -527,8 +527,8 @@ CREATE TABLE JCL_ORG_CARDBUTTON ( URL NVARCHAR2(255) NULL, ROLES NVARCHAR2(2000) NULL, SYS_DEFAULT NUMBER NOT NULL, - SHOW_ORDER int null, - OPEN NUMBER null, + SHOW_ORDER NUMBER NULL, + OPEN NUMBER NULL, CREATOR NUMBER NULL, DELETE_TYPE NUMBER NULL, CREATE_TIME DATE NULL, diff --git a/src/com/engine/organization/service/impl/HrmPersonnelCardServiceImpl.java b/src/com/engine/organization/service/impl/HrmPersonnelCardServiceImpl.java index bc86daca..060d7ec3 100644 --- a/src/com/engine/organization/service/impl/HrmPersonnelCardServiceImpl.java +++ b/src/com/engine/organization/service/impl/HrmPersonnelCardServiceImpl.java @@ -119,7 +119,7 @@ public class HrmPersonnelCardServiceImpl extends Service implements HrmPersonnel for (ResourceBaseTab resourceBaseTab : resourceBaseTabList) { anchorList.add(Anchor.builder().id("tab" + resourceBaseTab.getId()).title(resourceBaseTab.getGroupName()).build()); } - resultMap.put("button", getButtonList(ecResourceId)); + resultMap.put("buttons", getButtonList(ecResourceId)); resultMap.put("user", userInfo); resultMap.put("statistical", statistical); resultMap.put("formItems", formItemList); @@ -289,7 +289,7 @@ public class HrmPersonnelCardServiceImpl extends Service implements HrmPersonnel for (CardButtonPO cardButton : cardButtonPOS) { - List accessRoleIds = new ArrayList<>(Arrays.asList(cardButton.getRoles().split(","))); + List accessRoleIds = new ArrayList<>(Arrays.asList(Util.null2String(cardButton.getRoles()).split(","))); roleIds.retainAll(accessRoleIds); if (isAdmin || (isMySelf && "0".equals(cardButton.getSysDefault())) || CollectionUtils.isNotEmpty(roleIds)) { buttonList.add(CardButtonPO.builder().name(cardButton.getName()).url(cardButton.getUrl()).sysDefault(cardButton.getSysDefault()).build());