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/HrmTransferApplicationServiceImpl.java | 85 +++++++++++++++++++++++++++++++++---------
1 files changed, 67 insertions(+), 18 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmTransferApplicationServiceImpl.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmTransferApplicationServiceImpl.java
index 9482aed..5464870 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmTransferApplicationServiceImpl.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmTransferApplicationServiceImpl.java
@@ -2,6 +2,7 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjUtil;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import cn.iocoder.yudao.framework.common.exception.ServiceException;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
@@ -15,7 +16,9 @@
import cn.iocoder.yudao.module.hrm.controller.admin.approval.vo.HrmTransferApplicationRespVO;
import cn.iocoder.yudao.module.hrm.controller.admin.approval.vo.HrmTransferApplicationSaveReqVO;
import cn.iocoder.yudao.module.hrm.dal.dataobject.approval.HrmTransferApplicationDO;
+import cn.iocoder.yudao.module.hrm.dal.dataobject.employee.HrmEmployeeDO;
import cn.iocoder.yudao.module.hrm.dal.mysql.approval.HrmTransferApplicationMapper;
+import cn.iocoder.yudao.module.hrm.dal.mysql.employee.HrmEmployeeMapper;
import cn.iocoder.yudao.module.hrm.dal.redis.HrmNoRedisDAO;
import cn.iocoder.yudao.module.hrm.enums.HrmAuditStatusEnum;
import cn.iocoder.yudao.module.hrm.enums.HrmTransferTypeEnum;
@@ -60,6 +63,8 @@
@Resource
private HrmTransferApplicationMapper transferApplicationMapper;
@Resource
+ private HrmEmployeeMapper employeeMapper;
+ @Resource
private HrmNoRedisDAO noRedisDAO;
@Resource
private DeptApi deptApi;
@@ -87,6 +92,7 @@
if (Objects.equals(createReqVO.getTargetPostId(), createReqVO.getCurrentPostId())) {
throw exception(TRANSFER_APPLICATION_SAME_POST);
}
+ validateTargetDeptAndPost(createReqVO.getTargetDeptId(), createReqVO.getTargetPostId());
// 3. 纭畾琚皟宀楀憳宸ワ紙鏈寚瀹氭椂榛樿褰撳墠鐧诲綍鐢ㄦ埛锛�
Long userId = createReqVO.getUserId() != null ? createReqVO.getUserId() : getLoginUserId();
AdminUserRespDTO user = userId != null ? adminUserApi.getUser(userId) : null;
@@ -99,6 +105,7 @@
throw new ServiceException(TRANSFER_APPLICATION_APPLICANT_DEPT_EMPTY.getCode(),
String.format("璋冨矖鐢宠澶辫触锛氬憳宸%s]鏈缃儴闂紝鏃犳硶纭畾鍘熼儴闂ㄣ�傝鍏堝埌銆屽憳宸ョ鐞嗐�嶇紪杈戣鍛樺伐妗ｆ琛ュ叏閮ㄩ棬锛屽啀閲嶆柊鍙戣捣璋冨矖鐢宠銆�", user.getNickname()));
}
+ validateCurrentDept(userId, createReqVO.getCurrentDeptId());
if (createReqVO.getCurrentPostId() == null) {
throw new ServiceException(TRANSFER_APPLICATION_APPLICANT_POST_EMPTY.getCode(),
String.format("璋冨矖鐢宠澶辫触锛氬憳宸%s]鏈缃矖浣嶏紝鏃犳硶纭畾鍘熷矖浣嶃�傝鍏堝埌銆屽憳宸ョ鐞嗐�嶇紪杈戣鍛樺伐妗ｆ琛ュ叏宀椾綅锛屽啀閲嶆柊鍙戣捣璋冨矖鐢宠銆�", user.getNickname()));
@@ -131,9 +138,13 @@
@Override
public void updateTransferApplication(HrmTransferApplicationSaveReqVO updateReqVO) {
HrmTransferApplicationDO application = validateTransferApplicationExists(updateReqVO.getId());
+ validateOperator(application, getLoginUserId());
if (!Objects.equals(application.getStatus(), HrmAuditStatusEnum.DRAFT.getStatus())
- && !Objects.equals(application.getStatus(), HrmAuditStatusEnum.PROCESS.getStatus())) {
- throw exception(TRANSFER_APPLICATION_UPDATE_FAIL_NOT_DRAFT);
+ && !Objects.equals(application.getStatus(), HrmAuditStatusEnum.REJECT.getStatus())) {
+ throw exception(TRANSFER_APPLICATION_UPDATE_FAIL_NOT_EDITABLE);
+ }
+ if (updateReqVO.getUserId() != null && !Objects.equals(updateReqVO.getUserId(), application.getUserId())) {
+ throw exception(TRANSFER_APPLICATION_APPLICANT_IMMUTABLE);
}
if (Objects.equals(updateReqVO.getTargetDeptId(), updateReqVO.getCurrentDeptId())) {
throw exception(TRANSFER_APPLICATION_SAME_DEPT);
@@ -141,7 +152,11 @@
if (Objects.equals(updateReqVO.getTargetPostId(), updateReqVO.getCurrentPostId())) {
throw exception(TRANSFER_APPLICATION_SAME_POST);
}
+ validateTargetDeptAndPost(updateReqVO.getTargetDeptId(), updateReqVO.getTargetPostId());
+ validateCurrentDept(application.getUserId(),
+ updateReqVO.getCurrentDeptId() != null ? updateReqVO.getCurrentDeptId() : application.getCurrentDeptId());
HrmTransferApplicationDO updateObj = BeanUtils.toBean(updateReqVO, HrmTransferApplicationDO.class);
+ updateObj.setUserId(null);
transferApplicationMapper.updateById(updateObj);
storageAttachmentApi.updateAttachments("file", "hrm_transfer_application", updateReqVO.getId(), updateReqVO.getBlobIds());
}
@@ -149,6 +164,7 @@
@Override
public void deleteTransferApplication(Long id) {
HrmTransferApplicationDO application = validateTransferApplicationExists(id);
+ validateOperator(application, getLoginUserId());
if (!Objects.equals(application.getStatus(), HrmAuditStatusEnum.DRAFT.getStatus())) {
throw exception(TRANSFER_APPLICATION_UPDATE_FAIL_NOT_DRAFT);
}
@@ -263,9 +279,13 @@
@Transactional(rollbackFor = Exception.class)
public void submitTransferApplication(Long id, String processDefinitionKey, Long userId) {
HrmTransferApplicationDO application = validateTransferApplicationExists(id);
- if (ObjUtil.notEqual(application.getStatus(), HrmAuditStatusEnum.DRAFT.getStatus())) {
+ validateOperator(application, userId);
+ if (ObjUtil.notEqual(application.getStatus(), HrmAuditStatusEnum.DRAFT.getStatus())
+ && ObjUtil.notEqual(application.getStatus(), HrmAuditStatusEnum.REJECT.getStatus())) {
throw exception(TRANSFER_APPLICATION_SUBMIT_FAIL_NOT_DRAFT);
}
+ validateTargetDeptAndPost(application.getTargetDeptId(), application.getTargetPostId());
+ validateCurrentDept(application.getUserId(), application.getCurrentDeptId());
// 鍏ㄥ眬鍏嶅鎵癸細涓氬姟鏍￠獙閫氳繃鍚庣洿鎺ユ墽琛屽鎵归�氳繃閫昏緫锛屾棤闇�娴佺▼妯″瀷銆�
if (bpmProcessInstanceApi.isGlobalAutoApprove()) {
transferApplicationMapper.updateById(HrmTransferApplicationDO.builder()
@@ -278,17 +298,45 @@
}
validateApproveCategoryAndProcessDefinition();
- ProcessDefinition processDefinition = bpmProcessDefinitionService.getActiveProcessDefinition(processDefinitionKey);
- if (processDefinition == null) {
+ if (processDefinitionKey == null || processDefinitionKey.isBlank()) {
throw exception(TRANSFER_APPLICATION_BPM_PROCESS_DEFINITION_NOT_EXISTS);
}
- String processInstanceId = bpmProcessInstanceApi.createProcessInstance(userId, new BpmProcessInstanceCreateReqDTO()
- .setProcessDefinitionKey(processDefinitionKey).setBusinessKey(String.valueOf(id)));
- transferApplicationMapper.updateById(HrmTransferApplicationDO.builder()
- .id(id)
- .processInstanceId(processInstanceId)
- .status(HrmAuditStatusEnum.PROCESS.getStatus())
- .build());
+ ProcessDefinition processDefinition = bpmProcessDefinitionService.getActiveProcessDefinition(processDefinitionKey);
+ if (processDefinition == null || bpmProcessDefinitionService
+ .getProcessDefinitionInfoListByCategory(APPROVE_CATEGORY_CODE).stream()
+ .noneMatch(info -> Objects.equals(info.getProcessDefinitionId(), processDefinition.getId()))) {
+ throw exception(TRANSFER_APPLICATION_BPM_PROCESS_DEFINITION_NOT_EXISTS);
+ }
+ String processInstanceId = bpmProcessInstanceApi.createProcessInstance(application.getUserId(), new BpmProcessInstanceCreateReqDTO()
+ .setProcessDefinitionKey(processDefinitionKey).setBusinessKey(String.valueOf(id))
+ .setVariables(Map.of("businessNo", application.getNo())));
+ transferApplicationMapper.update(null, new LambdaUpdateWrapper<HrmTransferApplicationDO>()
+ .eq(HrmTransferApplicationDO::getId, id)
+ .set(HrmTransferApplicationDO::getProcessInstanceId, processInstanceId)
+ .set(HrmTransferApplicationDO::getStatus, HrmAuditStatusEnum.PROCESS.getStatus())
+ .set(HrmTransferApplicationDO::getApproveTime, null));
+ }
+
+ private void validateTargetDeptAndPost(Long targetDeptId, Long targetPostId) {
+ deptApi.validateDeptList(Collections.singletonList(targetDeptId));
+ postApi.validPostList(Collections.singletonList(targetPostId));
+ }
+
+ private void validateOperator(HrmTransferApplicationDO application, Long operatorId) {
+ if (!Objects.equals(application.getUserId(), operatorId)
+ && !Objects.equals(application.getCreator(), String.valueOf(operatorId))) {
+ throw exception(TRANSFER_APPLICATION_OPERATOR_NOT_ALLOWED);
+ }
+ }
+
+ private void validateCurrentDept(Long userId, Long currentDeptId) {
+ HrmEmployeeDO employee = employeeMapper.selectByUserId(userId);
+ if (employee == null || employee.getDeptId() == null) {
+ throw exception(TRANSFER_APPLICATION_EMPLOYEE_DEPT_NOT_FOUND);
+ }
+ if (!Objects.equals(employee.getDeptId(), currentDeptId)) {
+ throw exception(TRANSFER_APPLICATION_CURRENT_DEPT_MISMATCH);
+ }
}
private void validateApproveCategoryAndProcessDefinition() {
@@ -344,11 +392,12 @@
log.error("[updateTransferApplicationAuditStatus][application({}) 涓嶅浜庡鎵逛腑锛屾棤娉曟洿鏂板鎵圭粨鏋�({})]", id, status);
throw exception(TRANSFER_APPLICATION_UPDATE_AUDIT_STATUS_FAIL_NOT_PROCESS);
}
- transferApplicationMapper.updateById(HrmTransferApplicationDO.builder()
- .id(id)
- .status(status)
- .approveTime(java.time.LocalDateTime.now())
- .build());
+ transferApplicationMapper.update(null, new LambdaUpdateWrapper<HrmTransferApplicationDO>()
+ .eq(HrmTransferApplicationDO::getId, id)
+ .set(HrmTransferApplicationDO::getStatus, status)
+ .set(HrmTransferApplicationDO::getApproveTime,
+ Objects.equals(status, HrmAuditStatusEnum.APPROVE.getStatus())
+ ? java.time.LocalDateTime.now() : null));
}
@Override
@@ -356,4 +405,4 @@
return transferApplicationMapper.selectByProcessInstanceId(processInstanceId);
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3