From ceba6b5d62c4a6c5777dedbd2f6ff8c972b94937 Mon Sep 17 00:00:00 2001
From: dxfeng <dongxuefengdd@163.com>
Date: Mon, 1 Aug 2022 09:09:39 +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

---
 .../organization/mapper/extend/ExtendInfoMapper.xml   |  2 +-
 .../organization/service/impl/ExtServiceImpl.java     | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/com/engine/organization/mapper/extend/ExtendInfoMapper.xml b/src/com/engine/organization/mapper/extend/ExtendInfoMapper.xml
index c97d9b0a..3b25570c 100644
--- a/src/com/engine/organization/mapper/extend/ExtendInfoMapper.xml
+++ b/src/com/engine/organization/mapper/extend/ExtendInfoMapper.xml
@@ -244,7 +244,7 @@
         <include refid="baseColumns"/>
         FROM
         jcl_field_extendinfo t
-        WHERE t.delete_type = 0 and t.isenable = 1
+        WHERE t.delete_type = 0
         <if test=" extendType != null and extendType != '' ">
             and extend_type = #{extendType}
         </if>
diff --git a/src/com/engine/organization/service/impl/ExtServiceImpl.java b/src/com/engine/organization/service/impl/ExtServiceImpl.java
index 2346fee9..2f6c2622 100644
--- a/src/com/engine/organization/service/impl/ExtServiceImpl.java
+++ b/src/com/engine/organization/service/impl/ExtServiceImpl.java
@@ -61,7 +61,7 @@ public class ExtServiceImpl extends Service implements ExtService {
 
         // 2编辑 1查看
         OrganizationAssert.notNull(groupId, "请选择对应的拓展页");
-        List<ExtendInfoPO> infoPOList = getExtendInfoMapper().listFields(extendType, groupId, tableName, ExtendInfoOperateType.EDIT.getValue(), "");
+        List<ExtendInfoPO> infoPOList = getExtendInfoMapper().listFields(extendType, groupId, tableName, ExtendInfoOperateType.EDIT.getValue(), "1");
         String fields = infoPOList.stream().map(ExtendInfoPO::getFieldName).collect(Collectors.joining(","));
         if (StringUtils.isEmpty(fields)) {
             return conditionItems;
@@ -96,7 +96,7 @@ public class ExtServiceImpl extends Service implements ExtService {
 
         // 2编辑 1查看
         OrganizationAssert.notNull(groupId, "请选择对应的拓展页");
-        List<ExtendInfoPO> infoPOList = getExtendInfoMapper().listFields(extendType, groupId, tableName, ExtendInfoOperateType.ADD.getValue(), "");
+        List<ExtendInfoPO> infoPOList = getExtendInfoMapper().listFields(extendType, groupId, tableName, ExtendInfoOperateType.ADD.getValue(), "1");
         // 组装拓展页内容
         List<String> readOnlyFieldList = Arrays.asList(readOnlyFields);
         for (ExtendInfoPO extendInfoPO : infoPOList) {
@@ -133,7 +133,7 @@ public class ExtServiceImpl extends Service implements ExtService {
         // 查询明细表
         List<ExtendGroupPO> extendGroupList = getExtendGroupMapper().listGroupByPid(groupId);
         for (ExtendGroupPO extendGroup : extendGroupList) {
-            infoPOList.addAll(getExtendInfoMapper().listFields(extendType, extendGroup.getId() + "", tableName, "", ""));
+            infoPOList.addAll(getExtendInfoMapper().listFields(extendType, extendGroup.getId() + "", tableName, "", "1"));
         }
         // 查询所有分布模块，拓展明细表信息
         Map<Long, List<ExtendInfoPO>> groupMap = infoPOList.stream().collect(Collectors.groupingBy(ExtendInfoPO::getExtendGroupId));
@@ -171,10 +171,11 @@ public class ExtServiceImpl extends Service implements ExtService {
      */
     public List<TopTab> getTabInfo(String extendType, String tableName) {
         List<TopTab> topTabs = new ArrayList<>();
-        List<ExtendInfoPO> infoPOList = getExtendInfoMapper().listFields(extendType, "", tableName, ExtendInfoOperateType.EDIT.getValue(), "");
-        List<ExtendInfoPO> infoPOList1 = getExtendInfoMapper().listFields(extendType, "", tableName.toLowerCase().replace("ext", ""), ExtendInfoOperateType.EDIT.getValue(), "");
+        List<ExtendInfoPO> infoPOList = getExtendInfoMapper().listFields(extendType, "", tableName, ExtendInfoOperateType.EDIT.getValue(), "1");
+        List<ExtendInfoPO> infoPOList1 = getExtendInfoMapper().listFields(extendType, "", tableName.toLowerCase().replace("ext", ""), ExtendInfoOperateType.EDIT.getValue(), "1");
         infoPOList.addAll(infoPOList1);
         List<Long> ids = infoPOList.stream().map(ExtendInfoPO::getExtendGroupId).collect(Collectors.toList());
+
         List<ExtendTitlePO> extendTitles = getExtendTitleMapper().getTitlesByIds(ids);
         Set<Long> groupIds = extendTitles.stream().map(ExtendTitlePO::getGroupId).collect(Collectors.toSet());
         List<ExtendGroupPO> extendGroupList = getExtendGroupMapper().listByType(Integer.parseInt(extendType));