diff --git a/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/pojo/request/BaseRequest.java b/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/pojo/request/BaseRequest.java index 693bf071c..e53226f8f 100644 --- a/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/pojo/request/BaseRequest.java +++ b/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/pojo/request/BaseRequest.java @@ -123,4 +123,10 @@ public class BaseRequest implements Serializable { public @interface updateStatus { } + /** + * 参数校验分组:批量删除 + */ + public @interface batchDelete { + } + } diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/organization/HrPositionRequest.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/organization/HrPositionRequest.java index ea45b59c1..9054e30bd 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/organization/HrPositionRequest.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/organization/HrPositionRequest.java @@ -33,6 +33,7 @@ import lombok.EqualsAndHashCode; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.math.BigDecimal; +import java.util.List; /** * 系统职位表 @@ -87,4 +88,10 @@ public class HrPositionRequest extends BaseRequest { */ private String positionRemark; + /** + * 职位id集合(用在批量操作) + */ + @NotNull(message = "职位id集合不能为空", groups = {batchDelete.class}) + private List positionIds; + } diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/user/request/SysUserRequest.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/user/request/SysUserRequest.java index 9e7f923fc..e147a3497 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/user/request/SysUserRequest.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/user/request/SysUserRequest.java @@ -220,12 +220,6 @@ public class SysUserRequest extends BaseRequest { public @interface reg { } - /** - * 参数校验分组:批量删除 - */ - public @interface batchDelete { - } - } diff --git a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/controller/HrPositionController.java b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/controller/HrPositionController.java index e7d86c510..3b93d6fa4 100644 --- a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/controller/HrPositionController.java +++ b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/controller/HrPositionController.java @@ -75,6 +75,18 @@ public class HrPositionController { return new SuccessResponseData(); } + /** + * 批量删除系统职位 + * + * @author fengshuonan + * @date 2021/4/8 13:50 + */ + @PostResource(name = "批量删除系统职位", path = "/hrPosition/batchDelete") + public ResponseData batchDelete(@RequestBody @Validated(HrPositionRequest.delete.class) HrPositionRequest hrPositionRequest) { + hrPositionService.batchDel(hrPositionRequest); + return new SuccessResponseData(); + } + /** * 编辑系统职位 * diff --git a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/HrPositionService.java b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/HrPositionService.java index 1851a4bdc..1af94a1e4 100644 --- a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/HrPositionService.java +++ b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/HrPositionService.java @@ -106,4 +106,13 @@ public interface HrPositionService extends IService, PositionService */ PageResult findPage(HrPositionRequest hrPositionRequest); + /** + * 批量删除系统职位 + * + * @param hrPositionRequest 请求参数 + * @author fengshuonan + * @date 2021/4/8 13:51 + */ + void batchDel(HrPositionRequest hrPositionRequest); + } diff --git a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrPositionServiceImpl.java b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrPositionServiceImpl.java index 7a2cd61df..4fd95d24a 100644 --- a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrPositionServiceImpl.java +++ b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrPositionServiceImpl.java @@ -35,10 +35,10 @@ import cn.stylefeng.roses.kernel.rule.enums.YesOrNotEnum; import cn.stylefeng.roses.kernel.system.api.UserOrgServiceApi; import cn.stylefeng.roses.kernel.system.api.exception.SystemModularException; import cn.stylefeng.roses.kernel.system.api.exception.enums.organization.PositionExceptionEnum; +import cn.stylefeng.roses.kernel.system.api.pojo.organization.HrPositionRequest; import cn.stylefeng.roses.kernel.system.modular.organization.entity.HrPosition; import cn.stylefeng.roses.kernel.system.modular.organization.mapper.HrPositionMapper; import cn.stylefeng.roses.kernel.system.modular.organization.service.HrPositionService; -import cn.stylefeng.roses.kernel.system.api.pojo.organization.HrPositionRequest; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -117,6 +117,16 @@ public class HrPositionServiceImpl extends ServiceImpl positionIds = hrPositionRequest.getPositionIds(); + for (Long userId : positionIds) { + HrPositionRequest tempRequest = new HrPositionRequest(); + tempRequest.setPositionId(userId); + this.del(tempRequest); + } + } + /** * 根据主键id获取对象信息 *