diff --git a/src/com/engine/organization/service/FieldDefinedService.java b/src/com/engine/organization/service/FieldDefinedService.java index 958a4aa9..113eeea9 100644 --- a/src/com/engine/organization/service/FieldDefinedService.java +++ b/src/com/engine/organization/service/FieldDefinedService.java @@ -68,10 +68,10 @@ public interface FieldDefinedService { /** * 删除标题信息 * - * @param param + * @param id * @return */ - int deleteTitle(ExtendTitleSaveParam param); + int deleteTitle(Long id); /** * 获取自定义字段列表 diff --git a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java index e3b124c2..c2cc48b8 100644 --- a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java +++ b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java @@ -192,10 +192,8 @@ 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()); + public int deleteTitle(Long id) { + return getExtendTitleMapper().deleteExtendTitleByIds(DeleteParam.builder().ids(id.toString()).build().getIds()); } @Override diff --git a/src/com/engine/organization/web/FieldDefinedController.java b/src/com/engine/organization/web/FieldDefinedController.java index 4cc70a65..dbefccf1 100644 --- a/src/com/engine/organization/web/FieldDefinedController.java +++ b/src/com/engine/organization/web/FieldDefinedController.java @@ -127,10 +127,10 @@ public class FieldDefinedController { @POST @Path("/{moduleTypeEnum}/deleteTitle") @Produces(MediaType.APPLICATION_JSON) - public ReturnResult deleteTitle(@Context HttpServletRequest request, @Context HttpServletResponse response, @PathParam("moduleTypeEnum") ModuleTypeEnum moduleTypeEnum, @RequestBody ExtendTitleSaveParam param) { + public ReturnResult deleteTitle(@Context HttpServletRequest request, @Context HttpServletResponse response, @PathParam("moduleTypeEnum") ModuleTypeEnum moduleTypeEnum, @QueryParam("id") Long id) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getFieldDefinedWrapper(user).deleteTitle(param)); + return ReturnResult.successed(getFieldDefinedWrapper(user).deleteTitle(id)); } catch (Exception e) { return ReturnResult.exceptionHandle(e.getMessage()); } diff --git a/src/com/engine/organization/wrapper/FieldDefinedWrapper.java b/src/com/engine/organization/wrapper/FieldDefinedWrapper.java index b8a39171..77876ce4 100644 --- a/src/com/engine/organization/wrapper/FieldDefinedWrapper.java +++ b/src/com/engine/organization/wrapper/FieldDefinedWrapper.java @@ -68,7 +68,7 @@ public class FieldDefinedWrapper extends Service { - public int deleteTitle(ExtendTitleSaveParam param) { - return getFieldDefinedService(user).deleteTitle(param); + public int deleteTitle(Long id) { + return getFieldDefinedService(user).deleteTitle(id); } }