fix(hrm): 社保扣款在员工未加社保时误扣、两方案扣款相同

tuqin

2 天以前 1d372d5e4916eaecf9b773e52e0d887d4fd0e47a

 yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/HrmResignationApplicationController.java

@@ -9,6 +9,7 @@
import cn.iocoder.yudao.module.hrm.controller.admin.approval.vo.HrmResignationApplicationPageReqVO;
import cn.iocoder.yudao.module.hrm.controller.admin.approval.vo.HrmResignationApplicationRespVO;
import cn.iocoder.yudao.module.hrm.controller.admin.approval.vo.HrmResignationApplicationSaveReqVO;
import cn.iocoder.yudao.module.hrm.controller.admin.approval.vo.HrmResignationHandoverReqVO;
import cn.iocoder.yudao.module.hrm.service.approval.HrmResignationApplicationService;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
@@ -82,10 +83,10 @@
    @PostMapping("/submit")
    @Operation(summary = "提交离职申请审批")
    @Parameter(name = "id", description = "申请ID", required = true)
    @Parameter(name = "processDefinitionKey", description = "流程定义Key", required = true)
    @Parameter(name = "processDefinitionKey", description = "流程定义Key（不传时自动使用「离职审批」分类下最新的活跃流程）")
    @PreAuthorize("@ss.hasPermission('hrm:resignation:submit')")
    public CommonResult<Boolean> submitResignationApplication(@RequestParam("id") Long id,
                                                              @RequestParam("processDefinitionKey") String processDefinitionKey) {
                                                              @RequestParam(value = "processDefinitionKey", required = false) String processDefinitionKey) {
        Long userId = SecurityFrameworkUtils.getLoginUserId();
        resignationApplicationService.submitResignationApplication(id, processDefinitionKey, userId);
        return success(true);
@@ -98,6 +99,14 @@
        return success(resignationApplicationService.getApproveProcessDefinitionList());
    }

    @PutMapping("/handover")
    @Operation(summary = "更新交接状态")
    @PreAuthorize("@ss.hasPermission('hrm:resignation:update')")
    public CommonResult<Boolean> updateHandoverStatus(@Valid @RequestBody HrmResignationHandoverReqVO reqVO) {
        resignationApplicationService.updateHandoverStatus(reqVO);
        return success(true);
    }

    @GetMapping("/export-excel")
    @Operation(summary = "导出离职申请 Excel")
    @PreAuthorize("@ss.hasPermission('hrm:resignation:export')")