Pre Merge pull request !93 from reset/feature/cl

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 @@
             <if test="isShow != null ">
                 is_show,
             </if>
+            <if test="showOrder != null ">
+                show_order,
+            </if>
         </trim>
         <trim prefix="VALUES (" suffix=")" suffixOverrides=",">
             <if test="creator != null">
@@ -123,6 +127,9 @@
             <if test="isShow != null ">
                 #{isShow},
             </if>
+            <if test="showOrder != null ">
+                #{showOrder},
+            </if>
         </trim>
     </insert>
 

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<ExtendGroupPO> extendGroupPOList = MapperProxyFactory.getProxy(ExtendGroupMapper.class).listGroupByPid(fieldTypeTreeParam.getParentId());
+            List<ExtendGroupPO> 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<ExtendTitlePO> 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())