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 @@
FROM
jcl_field_extendinfo t
- WHERE t.delete_type = 0 and t.isenable = 1
+ WHERE t.delete_type = 0
and extend_type = #{extendType}
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 infoPOList = getExtendInfoMapper().listFields(extendType, groupId, tableName, ExtendInfoOperateType.EDIT.getValue(), "");
+ List 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 infoPOList = getExtendInfoMapper().listFields(extendType, groupId, tableName, ExtendInfoOperateType.ADD.getValue(), "");
+ List infoPOList = getExtendInfoMapper().listFields(extendType, groupId, tableName, ExtendInfoOperateType.ADD.getValue(), "1");
// 组装拓展页内容
List readOnlyFieldList = Arrays.asList(readOnlyFields);
for (ExtendInfoPO extendInfoPO : infoPOList) {
@@ -133,7 +133,7 @@ public class ExtServiceImpl extends Service implements ExtService {
// 查询明细表
List 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> groupMap = infoPOList.stream().collect(Collectors.groupingBy(ExtendInfoPO::getExtendGroupId));
@@ -171,10 +171,11 @@ public class ExtServiceImpl extends Service implements ExtService {
*/
public List getTabInfo(String extendType, String tableName) {
List topTabs = new ArrayList<>();
- List infoPOList = getExtendInfoMapper().listFields(extendType, "", tableName, ExtendInfoOperateType.EDIT.getValue(), "");
- List infoPOList1 = getExtendInfoMapper().listFields(extendType, "", tableName.toLowerCase().replace("ext", ""), ExtendInfoOperateType.EDIT.getValue(), "");
+ List infoPOList = getExtendInfoMapper().listFields(extendType, "", tableName, ExtendInfoOperateType.EDIT.getValue(), "1");
+ List infoPOList1 = getExtendInfoMapper().listFields(extendType, "", tableName.toLowerCase().replace("ext", ""), ExtendInfoOperateType.EDIT.getValue(), "1");
infoPOList.addAll(infoPOList1);
List ids = infoPOList.stream().map(ExtendInfoPO::getExtendGroupId).collect(Collectors.toList());
+
List extendTitles = getExtendTitleMapper().getTitlesByIds(ids);
Set groupIds = extendTitles.stream().map(ExtendTitlePO::getGroupId).collect(Collectors.toSet());
List extendGroupList = getExtendGroupMapper().listByType(Integer.parseInt(extendType));