diff --git a/src/com/engine/organization/mapper/extend/ExtendGroupMapper.xml b/src/com/engine/organization/mapper/extend/ExtendGroupMapper.xml
index d7d533e0..f17809e6 100644
--- a/src/com/engine/organization/mapper/extend/ExtendGroupMapper.xml
+++ b/src/com/engine/organization/mapper/extend/ExtendGroupMapper.xml
@@ -5,6 +5,7 @@
+
@@ -22,6 +23,7 @@
, t.group_name
, t.is_system_default
, t.creator
+ , t.show_order
, t.delete_type
, t.create_time
, t.update_time
@@ -99,6 +101,9 @@
is_show,
+
+ show_order,
+
is_system_default,
@@ -128,13 +133,16 @@
#{isShow},
+
+ #{showOrder},
+
#{isSystemDefault},
-
+
update jcl_field_extendgroup
group_name=#{name},
@@ -142,7 +150,7 @@
WHERE id = #{id} AND delete_type = 0
-
+
update jcl_field_extendgroup
delete_type=1,
@@ -150,7 +158,7 @@
WHERE id = #{id} AND delete_type = 0
-
+
update jcl_field_extendgroup
group_name=#{groupName},
diff --git a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java
index 5cf8a778..8a0f89b0 100644
--- a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java
+++ b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java
@@ -199,14 +199,12 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ
@Override
public void changeTree(ModuleTypeEnum moduleTypeEnum, FieldTypeTreeParam fieldTypeTreeParam) {
if (fieldTypeTreeParam.getId() == null) {
- List extendGroupPOList = MapperProxyFactory.getProxy(ExtendGroupMapper.class).listGroupByPid(fieldTypeTreeParam.getParentId());
+ List extendGroupPOList = MapperProxyFactory.getProxy(ExtendGroupMapper.class).listByType(moduleTypeEnum.getValue());
ExtendGroupPO extendGroup = extendGroupPOList.stream().max(Comparator.comparing(ExtendGroupPO::getShowOrder)).get();
ExtendGroupPO extendGroupPO = buildExtendGroupType(moduleTypeEnum, fieldTypeTreeParam, extendGroup.getShowOrder());
MapperProxyFactory.getProxy(ExtendGroupMapper.class).insertIgnoreNull(extendGroupPO);
//默认新增title
- List titlesByGroupID = getExtendTitleMapper().getTitlesByGroupID(extendGroup.getId());
- ExtendTitlePO extendTitle = titlesByGroupID.stream().max(Comparator.comparing(ExtendTitlePO::getShowOrder)).get();
- ExtendTitlePO extendTitlePO = buildExtendTitleType(extendGroupPO, extendTitle.getShowOrder());
+ ExtendTitlePO extendTitlePO = buildExtendTitleType(extendGroupPO, 1);
MapperProxyFactory.getProxy(ExtendTitleMapper.class).insertIgnoreNull(extendTitlePO);
} else {
MapperProxyFactory.getProxy(ExtendGroupMapper.class).update(fieldTypeTreeParam.getId(), fieldTypeTreeParam.getName());
@@ -429,6 +427,8 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ
@Override
public void deleteTree(Long id) {
MapperProxyFactory.getProxy(ExtendGroupMapper.class).delete(id);
+ //明细表删除字段信息 todo
+
}
@Override
@@ -499,7 +499,7 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ
return ExtendTitlePO.builder()
.groupId(extendGroupPO.getId())
.title(extendGroupPO.getGroupName())
- .showOrder(++max)
+ .showOrder(max)
.isShow("1")
.isSystemDefault(1)
.creator((long) user.getUID())