处理代码冲突

src/com/engine/organization/service/FieldDefinedService.java

@@ -65,6 +65,20 @@ public interface FieldDefinedService {
      * @return
      */
     void changeTree(ModuleTypeEnum moduleTypeEnum, FieldTypeTreeParam fieldTypeTreeParam);
+    /**
+     * 删除标题信息
+     *
+     * @param param
+     * @return
+     */
+    int deleteTitle(ExtendTitleSaveParam param);
 
+    /**
+     * 获取自定义字段列表
+     *
+     * @param param
+     * @return
+     */
+    Map<String, Object> getFieldDefinedInfo(ExtendTitleSaveParam param);
 
 }

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

@@ -21,7 +21,6 @@ import com.engine.organization.util.OrganizationAssert;
 import com.engine.organization.util.db.MapperProxyFactory;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
-import weaver.general.Util;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -164,6 +163,7 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ
         return datas;
     }
 
+    @Override
     public void changeTree(ModuleTypeEnum moduleTypeEnum, FieldTypeTreeParam fieldTypeTreeParam) {
         if (fieldTypeTreeParam.getId() == null) {
             ExtendGroupPO extendGroupPO = buildExtendGroupType(moduleTypeEnum, fieldTypeTreeParam);
@@ -176,6 +176,17 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ
         }
 
     }
+    @Override
+    public int deleteTitle(ExtendTitleSaveParam param) {
+        int countFields = getExtendInfoMapper().countFieldsByGroupId(param.getGroupType());
+        OrganizationAssert.isTrue(countFields == 0, "当前分组下仍有字段信息，请删除字段信息后删除分组");
+        return getExtendTitleMapper().deleteExtendTitleByIds(DeleteParam.builder().ids(param.getId().toString()).build().getIds());
+    }
+
+    @Override
+    public Map<String, Object> getFieldDefinedInfo(ExtendTitleSaveParam param) {
+        return null;
+    }
 
     private ExtendTitlePO buildExtendTitleType(ExtendGroupPO extendGroupPO) {
         return ExtendTitlePO.builder()