From defe1e1c3ade87de0a7990f565f08f93aeb2decc Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期日, 08 十一月 2026 19:31:46 +0800
Subject: [PATCH] fix(bpm): 统一审批标题单号并收紧各模块提交校验
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmResignationApplicationServiceImpl.java | 53 +++++++++++++++++++++++++++++++++--------------------
1 files changed, 33 insertions(+), 20 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmResignationApplicationServiceImpl.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmResignationApplicationServiceImpl.java
index 8b8fe32..8ed062c 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmResignationApplicationServiceImpl.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmResignationApplicationServiceImpl.java
@@ -1,6 +1,7 @@
package cn.iocoder.yudao.module.hrm.service.approval;
import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil;
@@ -150,8 +151,12 @@
@Override
public void updateResignationApplication(HrmResignationApplicationSaveReqVO updateReqVO) {
HrmResignationApplicationDO application = validateResignationApplicationExists(updateReqVO.getId());
- if (!Objects.equals(application.getStatus(), HrmAuditStatusEnum.DRAFT.getStatus())) {
+ validateOperator(application, getCurrentUserId());
+ if (!isEditableResignationStatus(application.getStatus())) {
throw exception(RESIGNATION_APPLICATION_UPDATE_FAIL_NOT_DRAFT);
+ }
+ if (updateReqVO.getUserId() != null && !Objects.equals(updateReqVO.getUserId(), application.getUserId())) {
+ throw exception(RESIGNATION_APPLICATION_APPLICANT_IMMUTABLE);
}
HrmResignationApplicationDO updateObj = BeanUtils.toBean(updateReqVO, HrmResignationApplicationDO.class);
// 涓嶈鐩栫敵璇蜂汉锛涗氦鎺ヤ汉缁熶竴瑙ｆ瀽鎴愨�滃憳宸D + 鐢ㄦ埛ID鈥�
@@ -177,6 +182,7 @@
@Override
public void deleteResignationApplication(Long id) {
HrmResignationApplicationDO application = validateResignationApplicationExists(id);
+ validateOperator(application, getCurrentUserId());
if (!Objects.equals(application.getStatus(), HrmAuditStatusEnum.DRAFT.getStatus())) {
throw exception(RESIGNATION_APPLICATION_UPDATE_FAIL_NOT_DRAFT);
}
@@ -190,6 +196,11 @@
throw exception(RESIGNATION_APPLICATION_NOT_EXISTS);
}
return application;
+ }
+
+ private boolean isEditableResignationStatus(Integer status) {
+ return Objects.equals(status, HrmAuditStatusEnum.DRAFT.getStatus())
+ || Objects.equals(status, HrmAuditStatusEnum.REJECT.getStatus());
}
@Override
@@ -323,28 +334,29 @@
@Transactional(rollbackFor = Exception.class)
public void submitResignationApplication(Long id, String processDefinitionKey, Long userId) {
HrmResignationApplicationDO application = validateResignationApplicationExists(id);
- if (ObjUtil.notEqual(application.getStatus(), HrmAuditStatusEnum.DRAFT.getStatus())) {
+ validateOperator(application, userId);
+ if (!isEditableResignationStatus(application.getStatus())) {
throw exception(RESIGNATION_APPLICATION_SUBMIT_FAIL_NOT_DRAFT);
}
// 鍏ㄥ眬鍏嶅鎵癸細涓氬姟鏍￠獙閫氳繃鍚庣洿鎺ユ墽琛屽鎵归�氳繃閫昏緫锛屾棤闇�娴佺▼妯″瀷銆�
if (bpmProcessInstanceApi.isGlobalAutoApprove()) {
- resignationApplicationMapper.updateById(HrmResignationApplicationDO.builder()
- .id(id)
- .processInstanceId("")
- .status(HrmAuditStatusEnum.PROCESS.getStatus())
- .build());
+ resignationApplicationMapper.startApproval(id, "", HrmAuditStatusEnum.PROCESS.getStatus());
updateResignationApplicationAuditStatus(id, HrmAuditStatusEnum.APPROVE.getStatus());
return;
}
ProcessDefinition processDefinition = resolveActiveProcessDefinition(processDefinitionKey);
- String processInstanceId = bpmProcessInstanceApi.createProcessInstance(userId, new BpmProcessInstanceCreateReqDTO()
- .setProcessDefinitionKey(processDefinition.getKey()).setBusinessKey(String.valueOf(id)));
- resignationApplicationMapper.updateById(HrmResignationApplicationDO.builder()
- .id(id)
- .processInstanceId(processInstanceId)
- .status(HrmAuditStatusEnum.PROCESS.getStatus())
- .build());
+ String processInstanceId = bpmProcessInstanceApi.createProcessInstance(application.getUserId(), new BpmProcessInstanceCreateReqDTO()
+ .setProcessDefinitionKey(processDefinition.getKey()).setBusinessKey(String.valueOf(id))
+ .setVariables(Map.of("businessNo", application.getNo())));
+ resignationApplicationMapper.startApproval(id, processInstanceId, HrmAuditStatusEnum.PROCESS.getStatus());
+ }
+
+ private void validateOperator(HrmResignationApplicationDO application, Long operatorId) {
+ if (!Objects.equals(application.getUserId(), operatorId)
+ && !Objects.equals(application.getCreator(), String.valueOf(operatorId))) {
+ throw exception(RESIGNATION_APPLICATION_OPERATOR_NOT_ALLOWED);
+ }
}
private void validateApproveCategoryAndProcessDefinition() {
@@ -439,11 +451,12 @@
log.error("[updateResignationApplicationAuditStatus][application({}) 涓嶅浜庡鎵逛腑锛屾棤娉曟洿鏂板鎵圭粨鏋�({})]", id, status);
throw exception(RESIGNATION_APPLICATION_UPDATE_AUDIT_STATUS_FAIL_NOT_PROCESS);
}
- resignationApplicationMapper.updateById(HrmResignationApplicationDO.builder()
- .id(id)
- .status(status)
- .approveTime(java.time.LocalDateTime.now())
- .build());
+ resignationApplicationMapper.update(null, new LambdaUpdateWrapper<HrmResignationApplicationDO>()
+ .eq(HrmResignationApplicationDO::getId, id)
+ .set(HrmResignationApplicationDO::getStatus, status)
+ .set(HrmResignationApplicationDO::getApproveTime,
+ Objects.equals(status, HrmAuditStatusEnum.APPROVE.getStatus())
+ ? LocalDateTime.now() : null));
}
@Override
@@ -684,4 +697,4 @@
: String.format("ID=%s", employeeId);
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3