代码合并

src/com/engine/organization/enums/ModuleTypeEnum.java

@@ -1,6 +1,5 @@
 package com.engine.organization.enums;
 
-import com.engine.salary.enums.BaseEnum;
 
 /**
  * @Author weaver_cl

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

@@ -1,15 +1,26 @@
 package com.engine.organization.service.impl;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.engine.core.impl.Service;
 import com.engine.organization.entity.extend.bo.ExtendGroupBO;
 import com.engine.organization.entity.extend.po.ExtendGroupPO;
+import com.engine.organization.entity.extend.po.ExtendTitlePO;
 import com.engine.organization.entity.fieldset.vo.TypeTreeVO;
 import com.engine.organization.enums.ModuleTypeEnum;
 import com.engine.organization.mapper.extend.ExtendGroupMapper;
+import com.engine.organization.mapper.extend.ExtendInfoMapper;
+import com.engine.organization.mapper.extend.ExtendTitleMapper;
 import com.engine.organization.service.FieldDefinedService;
+import com.engine.organization.util.OrganizationAssert;
 import com.engine.organization.util.db.MapperProxyFactory;
+import com.weaver.general.Util;
+import org.apache.commons.lang.StringUtils;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Author weaver_cl
@@ -62,8 +73,8 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ
             return 0;
         }
         JSONObject jsonObject = JSON.parseObject(data);
-        String groupType = Util.null2String(jsonObject.get("groupType"));
+        String groupType = Util.null2String(jsonObject.getString("groupType"));
-        String groupId = Util.null2String(jsonObject.get("groupId"));
+        String groupId = Util.null2String(jsonObject.getString("groupId"));
         return 0;
     }