Merge pull request 'bug修复' (#56) from feature/cl into develop

Reviewed-on: #56

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,

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<String> accessRoleIds = new ArrayList<>(Arrays.asList(cardButton.getRoles().split(",")));
+            List<String> 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());