Pre Merge pull request !97 from dxfeng/feature/dxf

src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java

@@ -427,13 +427,15 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ
 
     @Override
     public void deleteTree(Long id) {
-        MapperProxyFactory.getProxy(ExtendGroupMapper.class).delete(id);
         //明细表删除字段信息、删除表结构
         ExtendGroupPO extendGroupPO = getExtendGroupMapper().getGroupById(id);
+        MapperProxyFactory.getProxy(ExtendGroupMapper.class).delete(id);
         List<ExtendInfoPO> extendInfoList = getExtendInfoMapper().listFields(extendGroupPO.getExtendType().toString(), extendGroupPO.getId().toString(), ExtendGroupBO.getTableNameByGroupPO(extendGroupPO), "");
         List<Long> ids = extendInfoList.stream().map(ExtendInfoPO::getId).collect(Collectors.toList());
-        // 删除数据
-        dropColumns(ids, extendGroupPO, extendInfoList);
+        if(CollectionUtils.isNotEmpty(ids)) {
+            // 删除数据
+            dropColumns(ids, extendGroupPO, extendInfoList);
+        }
     }
 
     @Override