From f83950d292a8933390b3b4b516f90f21a9946c68 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期四, 27 八月 2026 11:41:47 +0800
Subject: [PATCH] fix 修复逻辑缺陷
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmResignationApplicationServiceImpl.java | 42 ++++++++++++++++++++++++++++++++----------
1 files changed, 32 insertions(+), 10 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 b0858ce..8d97391 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
@@ -12,11 +12,13 @@
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.dal.dataobject.approval.HrmResignationApplicationDO;
import cn.iocoder.yudao.module.hrm.dal.mysql.approval.HrmResignationApplicationMapper;
import cn.iocoder.yudao.module.hrm.dal.redis.HrmNoRedisDAO;
import cn.iocoder.yudao.module.hrm.enums.HrmAuditStatusEnum;
import cn.iocoder.yudao.module.hrm.enums.HrmResignationTypeEnum;
+import cn.iocoder.yudao.module.hrm.service.handover.HrmUserHandoverService;
import cn.iocoder.yudao.module.system.api.dept.DeptApi;
import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
import cn.iocoder.yudao.module.system.api.storage.StorageAttachmentApi;
@@ -39,6 +41,8 @@
import java.util.stream.Collectors;
import java.util.stream.Stream;
+import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
+
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
import static cn.iocoder.yudao.module.hrm.enums.ErrorCodeConstants.*;
@@ -46,7 +50,7 @@
/**
* 绂昏亴鐢宠 Service 瀹炵幇绫�
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Service
@Validated
@@ -73,6 +77,8 @@
private StorageAttachmentApi storageAttachmentApi;
@Resource
private BpmProcessDefinitionService bpmProcessDefinitionService;
+ @Resource
+ private HrmUserHandoverService handoverService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -90,11 +96,13 @@
AdminUserRespDTO user = adminUserApi.getUser(userId);
if (user == null) {
userId = getCurrentUserId();
+ user = adminUserApi.getUser(userId);
}
HrmResignationApplicationDO application = BeanUtils.toBean(createReqVO, HrmResignationApplicationDO.class);
application.setNo(no);
application.setUserId(userId);
- application.setDeptId(createReqVO.getDeptId() != null ? createReqVO.getDeptId() : user.getDeptId());
+ application.setDeptId(createReqVO.getDeptId() != null ? createReqVO.getDeptId()
+ : (user != null ? user.getDeptId() : null));
application.setStatus(HrmAuditStatusEnum.DRAFT.getStatus());
application.setHandoverStatus(HANDOVER_STATUS_NOT_STARTED);
resignationApplicationMapper.insert(application);
@@ -104,7 +112,7 @@
}
private Long getCurrentUserId() {
- return 1L;
+ return SecurityFrameworkUtils.getLoginUserId();
}
private String generateUniqueNo() {
@@ -123,11 +131,7 @@
}
HrmResignationApplicationDO updateObj = BeanUtils.toBean(updateReqVO, HrmResignationApplicationDO.class);
resignationApplicationMapper.updateById(updateObj);
- if (updateReqVO.getBlobIds() != null) {
- storageAttachmentApi.deleteAttachmentsByRecord("hrm_resignation_application", updateReqVO.getId());
- storageAttachmentApi.bindAttachments("file", "hrm_resignation_application",
- updateReqVO.getId(), updateReqVO.getBlobIds());
- }
+ storageAttachmentApi.updateAttachments("file", "hrm_resignation_application", updateReqVO.getId(), updateReqVO.getBlobIds());
}
@Override
@@ -175,8 +179,8 @@
}
private void fillUserNames(HrmResignationApplicationRespVO respVO, HrmResignationApplicationDO application) {
- Set<Long> userIds = Set.of(application.getUserId(), application.getHandoverUserId())
- .stream().filter(Objects::nonNull).collect(Collectors.toSet());
+ Set<Long> userIds = Stream.of(application.getUserId(), application.getHandoverUserId())
+ .filter(Objects::nonNull).collect(Collectors.toSet());
Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(userIds);
if (application.getUserId() != null && userMap.containsKey(application.getUserId())) {
respVO.setUserName(userMap.get(application.getUserId()).getNickname());
@@ -323,4 +327,22 @@
return resignationApplicationMapper.selectByProcessInstanceId(processInstanceId);
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updateHandoverStatus(HrmResignationHandoverReqVO reqVO) {
+ HrmResignationApplicationDO application = validateResignationApplicationExists(reqVO.getId());
+ resignationApplicationMapper.updateById(HrmResignationApplicationDO.builder()
+ .id(reqVO.getId())
+ .handoverStatus(reqVO.getHandoverStatus())
+ .build());
+ // 浜ゆ帴瀹屾垚鏃讹紝鍒涘缓鐢ㄦ埛鏁版嵁浜ゆ帴鏄犲皠
+ if (Objects.equals(reqVO.getHandoverStatus(), HANDOVER_STATUS_COMPLETED)
+ && application.getHandoverUserId() != null) {
+ handoverService.createHandover(
+ application.getUserId(),
+ application.getHandoverUserId(),
+ application.getId());
+ }
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.3