From 854a40b7cdc28caf864f6f0e4a5e0fd16262d9a5 Mon Sep 17 00:00:00 2001
From: dxfeng <dongxuefengdd@163.com>
Date: Fri, 11 Nov 2022 14:11:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=8D=A1=E7=89=87=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E8=87=AA=E5=AE=9A=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/personnelcard/CardButtonMapper.xml     |  2 +-
 .../service/impl/CardAccessServiceImpl.java       | 15 ++++-----------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/com/engine/organization/mapper/personnelcard/CardButtonMapper.xml b/src/com/engine/organization/mapper/personnelcard/CardButtonMapper.xml
index f8f08369..558ee6f7 100644
--- a/src/com/engine/organization/mapper/personnelcard/CardButtonMapper.xml
+++ b/src/com/engine/organization/mapper/personnelcard/CardButtonMapper.xml
@@ -33,7 +33,7 @@
     <select id="listAll" resultType="com.engine.organization.entity.personnelcard.po.CardButtonPO">
         select
         <include refid="baseColumns"/>
-        from jcl_org_cardbutton where delete_type = 0
+        from jcl_org_cardbutton t where delete_type = 0
     </select>
 
     <select id="listEnableButton" resultType="com.engine.organization.entity.personnelcard.po.CardButtonPO">
diff --git a/src/com/engine/organization/service/impl/CardAccessServiceImpl.java b/src/com/engine/organization/service/impl/CardAccessServiceImpl.java
index 695a9811..35bad0d6 100644
--- a/src/com/engine/organization/service/impl/CardAccessServiceImpl.java
+++ b/src/com/engine/organization/service/impl/CardAccessServiceImpl.java
@@ -95,30 +95,23 @@ public class CardAccessServiceImpl extends Service implements CardAccessService
 
     @Override
     public Map<String, Object> getCardButtonTable() {
-        // 区分主表明细表
-
-        String tableName = "JCL_ORG_CARDBUTTON";
         List<ExtendInfoPO> infoPOList = new ArrayList<>();
-        infoPOList.add(ExtendInfoPO.builder().id(null).tableName(tableName).fieldName("name").fieldNameDesc("按钮名称").fieldType("varchar(50)").controlType(1).browserType("1").customValue("[\"input\",\"text\",\"50\"]").showOrder(1).isrequired(0).isSystemDefault(0).build());
-        infoPOList.add(ExtendInfoPO.builder().id(null).tableName(tableName).fieldName("status").fieldNameDesc("启用").fieldType("char(1)").controlType(4).browserType("1").customValue("[\"check\"]").showOrder(2).isrequired(0).isSystemDefault(0).build());
-        infoPOList.add(ExtendInfoPO.builder().id(null).tableName(tableName).fieldName("url").fieldNameDesc("跳转地址").fieldType("varchar(1000)").controlType(1).browserType("1").customValue("[\"input\",\"text\",\"1000\"]").showOrder(3).isrequired(0).isSystemDefault(0).build());
-        infoPOList.add(ExtendInfoPO.builder().id(null).tableName(tableName).fieldName("roles").fieldNameDesc("角色").fieldType("text").controlType(3).browserType("65").customValue("[\"browser\",{\"valueSpan\":\"多角色\",\"replaceDatas\":[{\"itemorderid\":\"65\",\"name\":\"多角色\",\"id\":\"65\",\"parenttitle\":\"人员\",\"title\":\"人员-多角色\"}],\"value\":\"65\"}]").showOrder(4).isrequired(0).isSystemDefault(0).build());
+        infoPOList.add(ExtendInfoPO.builder().id(null).fieldName("name").fieldNameDesc("按钮名称").fieldType("varchar(50)").controlType(1).browserType("1").customValue("[\"input\",\"text\",\"50\"]").showOrder(1).isrequired(0).isSystemDefault(0).build());
+        infoPOList.add(ExtendInfoPO.builder().id(null).fieldName("status").fieldNameDesc("启用").fieldType("char(1)").controlType(4).browserType("1").customValue("[\"check\"]").showOrder(2).isrequired(0).isSystemDefault(0).build());
+        infoPOList.add(ExtendInfoPO.builder().id(null).fieldName("url").fieldNameDesc("跳转地址").fieldType("varchar(1000)").controlType(1).browserType("1").customValue("[\"input\",\"text\",\"1000\"]").showOrder(3).isrequired(0).isSystemDefault(0).build());
+        infoPOList.add(ExtendInfoPO.builder().id(null).fieldName("roles").fieldNameDesc("角色").fieldType("text").controlType(3).browserType("65").customValue("[\"browser\",{\"valueSpan\":\"多角色\",\"replaceDatas\":[{\"itemorderid\":\"65\",\"name\":\"多角色\",\"id\":\"65\",\"parenttitle\":\"人员\",\"title\":\"人员-多角色\"}],\"value\":\"65\"}]").showOrder(4).isrequired(0).isSystemDefault(0).build());
 
         Map<String, Object> tabInfoMap = new HashMap<>();
         tabInfoMap.put("columns", ExtendInfoBO.convertInfoListToTable(user, infoPOList, 2, false));
-        // 去除null 元素
         List<CardButtonPO> cardButtonPOS = getCardButtonMapper().listAll();
-        // 兼容Oracle,map的key转换为小写
         List<Map<String, Object>> collect = cardButtonPOS.stream().map(item -> {
             Map<String, Object> resultMap = new HashMap<>();
-
             resultMap.put("id", item.getId());
             resultMap.put("name", item.getName());
             resultMap.put("status", item.getStatus());
             resultMap.put("url", item.getUrl());
             resultMap.put("roles", item.getRoles());
             resultMap.put("rolesspan", SystemTransMethod.getRoleName(item.getRoles()));
-
             return resultMap;
         }).collect(Collectors.toList());
         tabInfoMap.put("datas", collect);