From 568c9411da5de77455dbad941c2e38dd1bc56d61 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Tue, 14 Jun 2022 17:57:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/organization/enums/ModuleTypeEnum.java | 1 - .../service/impl/FieldDefinedServiceImpl.java | 15 +++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/com/engine/organization/enums/ModuleTypeEnum.java b/src/com/engine/organization/enums/ModuleTypeEnum.java index 15ee1269..404fa62b 100644 --- a/src/com/engine/organization/enums/ModuleTypeEnum.java +++ b/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 diff --git a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java index b40d3223..74d48918 100644 --- a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java +++ b/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 groupId = Util.null2String(jsonObject.get("groupId")); + String groupType = Util.null2String(jsonObject.getString("groupType")); + String groupId = Util.null2String(jsonObject.getString("groupId")); return 0; }