diff --git a/src/com/engine/organization/mapper/extend/ExtendGroupMapper.xml b/src/com/engine/organization/mapper/extend/ExtendGroupMapper.xml index d3b24e9d..98ac86a4 100644 --- a/src/com/engine/organization/mapper/extend/ExtendGroupMapper.xml +++ b/src/com/engine/organization/mapper/extend/ExtendGroupMapper.xml @@ -20,6 +20,7 @@ , t.extend_type , t.group_name , t.creator + , t.show_order , t.delete_type , t.create_time , t.update_time @@ -97,6 +98,9 @@ is_show, + + show_order, + @@ -123,6 +127,9 @@ #{isShow}, + + #{showOrder}, + diff --git a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java index 91b924c7..f5860a1e 100644 --- a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java +++ b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java @@ -196,14 +196,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()); @@ -430,6 +428,8 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ @Override public void deleteTree(Long id) { MapperProxyFactory.getProxy(ExtendGroupMapper.class).delete(id); + //明细表删除字段信息 todo + } @Override @@ -488,7 +488,7 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ return ExtendTitlePO.builder() .groupId(extendGroupPO.getId()) .title(extendGroupPO.getGroupName()) - .showOrder(++max) + .showOrder(max) .isShow("1") .creator((long) user.getUID()) .deleteType(DeleteTypeEnum.NOT_DELETED.getValue())