diff --git a/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/controller/HrOrgApproverController.java b/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/controller/HrOrgApproverController.java index 6353b1700..e21c062a5 100644 --- a/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/controller/HrOrgApproverController.java +++ b/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/controller/HrOrgApproverController.java @@ -63,4 +63,16 @@ public class HrOrgApproverController { return new SuccessResponseData<>(); } + /** + * 删除审批人的绑定 + * + * @author fengshuonan + * @since 2022/09/13 23:15 + */ + @PostResource(name = "删除审批人的绑定", path = "/hrOrgApprover/delete") + public ResponseData delete(@RequestBody @Validated(HrOrgApproverRequest.delete.class) HrOrgApproverRequest hrOrgApproverRequest) { + hrOrgApproverService.del(hrOrgApproverRequest); + return new SuccessResponseData<>(); + } + } diff --git a/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/pojo/request/HrOrgApproverRequest.java b/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/pojo/request/HrOrgApproverRequest.java index 72f24e7c3..9152da4f0 100644 --- a/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/pojo/request/HrOrgApproverRequest.java +++ b/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/pojo/request/HrOrgApproverRequest.java @@ -29,20 +29,21 @@ public class HrOrgApproverRequest extends BaseRequest { * 组织审批类型:1-负责人,2-部长,3-体系负责人,4-部门助理,5-资产助理(专员),6-考勤专员,7-HRBP,8-门禁员,9-办公账号员,10-转岗须知员 */ @ChineseDescription("组织审批类型:1-负责人,2-部长,3-体系负责人,4-部门助理,5-资产助理(专员),6-考勤专员,7-HRBP,8-门禁员,9-办公账号员,10-转岗须知员") - @NotNull(message = "组织审批类型不能为空", groups = {add.class}) + @NotNull(message = "组织审批类型不能为空", groups = {add.class, delete.class}) private Integer orgApproverType; /** * 组织机构id */ @ChineseDescription("组织机构id") - @NotNull(message = "组织机构id不能为空", groups = {list.class, add.class}) + @NotNull(message = "组织机构id不能为空", groups = {list.class, add.class, delete.class}) private Long orgId; /** * 用户id */ @ChineseDescription("用户id") + @NotNull(message = "用户id不能为空", groups = {delete.class}) private Long userId; /** diff --git a/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/service/HrOrgApproverService.java b/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/service/HrOrgApproverService.java index 9f0a918f2..9dd54bd5a 100644 --- a/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/service/HrOrgApproverService.java +++ b/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/service/HrOrgApproverService.java @@ -1,6 +1,5 @@ package cn.stylefeng.roses.kernel.sys.modular.org.service; -import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; import cn.stylefeng.roses.kernel.rule.pojo.dict.SimpleDict; import cn.stylefeng.roses.kernel.sys.modular.org.entity.HrOrgApprover; import cn.stylefeng.roses.kernel.sys.modular.org.pojo.request.HrOrgApproverRequest; @@ -16,15 +15,6 @@ import java.util.List; */ public interface HrOrgApproverService extends IService { - /** - * 新增 - * - * @param hrOrgApproverRequest 请求参数 - * @author fengshuonan - * @date 2023/06/10 21:23 - */ - void add(HrOrgApproverRequest hrOrgApproverRequest); - /** * 删除 * @@ -34,44 +24,6 @@ public interface HrOrgApproverService extends IService { */ void del(HrOrgApproverRequest hrOrgApproverRequest); - /** - * 编辑 - * - * @param hrOrgApproverRequest 请求参数 - * @author fengshuonan - * @date 2023/06/10 21:23 - */ - void edit(HrOrgApproverRequest hrOrgApproverRequest); - - /** - * 查询详情 - * - * @param hrOrgApproverRequest 请求参数 - * @author fengshuonan - * @date 2023/06/10 21:23 - */ - HrOrgApprover detail(HrOrgApproverRequest hrOrgApproverRequest); - - /** - * 获取列表 - * - * @param hrOrgApproverRequest 请求参数 - * @return List 返回结果 - * @author fengshuonan - * @date 2023/06/10 21:23 - */ - List findList(HrOrgApproverRequest hrOrgApproverRequest); - - /** - * 获取列表(带分页) - * - * @param hrOrgApproverRequest 请求参数 - * @return PageResult 返回结果 - * @author fengshuonan - * @date 2023/06/10 21:23 - */ - PageResult findPage(HrOrgApproverRequest hrOrgApproverRequest); - /** * 获取所有审批人类型列表 * diff --git a/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/service/impl/HrOrgApproverServiceImpl.java b/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/service/impl/HrOrgApproverServiceImpl.java index d359f677a..c10028a74 100644 --- a/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/service/impl/HrOrgApproverServiceImpl.java +++ b/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/service/impl/HrOrgApproverServiceImpl.java @@ -1,11 +1,7 @@ package cn.stylefeng.roses.kernel.sys.modular.org.service.impl; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; -import cn.stylefeng.roses.kernel.db.api.factory.PageFactory; -import cn.stylefeng.roses.kernel.db.api.factory.PageResultFactory; -import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; import cn.stylefeng.roses.kernel.dict.api.DictApi; import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException; import cn.stylefeng.roses.kernel.rule.pojo.dict.SimpleDict; @@ -20,7 +16,6 @@ import cn.stylefeng.roses.kernel.sys.modular.org.pojo.response.ApproverBindUserI import cn.stylefeng.roses.kernel.sys.modular.org.service.HrOrgApproverService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -44,36 +39,10 @@ public class HrOrgApproverServiceImpl extends ServiceImpl findPage(HrOrgApproverRequest hrOrgApproverRequest) { - LambdaQueryWrapper wrapper = createWrapper(hrOrgApproverRequest); - Page sysRolePage = this.page(PageFactory.defaultPage(), wrapper); - return PageResultFactory.createPageResult(sysRolePage); + LambdaQueryWrapper wrapper = this.createWrapper(hrOrgApproverRequest); + this.remove(wrapper); } @Override @@ -163,12 +132,6 @@ public class HrOrgApproverServiceImpl extends ServiceImpl findList(HrOrgApproverRequest hrOrgApproverRequest) { - LambdaQueryWrapper wrapper = this.createWrapper(hrOrgApproverRequest); - return this.list(wrapper); - } - @Override public void validateHaveOrgBind(Set beRemovedOrgIdList) { // none @@ -212,6 +175,10 @@ public class HrOrgApproverServiceImpl extends ServiceImpl