From 1fd52d7784a8b0b963cf38d63175cdf9082e8f43 Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期二, 03 十一月 2026 19:40:39 +0800
Subject: [PATCH] fix(hrm): 薪酬核算按出勤天数联动扣款、个税配置可保存、离职提交报错
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmResignationApplicationServiceImpl.java | 36 +++++++++++++++++++++++++++++++++---
1 files changed, 33 insertions(+), 3 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 54dfc6d..776d807 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
@@ -2,6 +2,7 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi;
@@ -33,6 +34,7 @@
import java.util.ArrayList;
import java.util.Collections;
+import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -93,12 +95,17 @@
String no = generateUniqueNo();
AdminUserRespDTO user = adminUserApi.getUser(userId);
if (user == null) {
+ // 浼犲叆鐨勫彲鑳戒笉鏄郴缁熺敤鎴稩D锛堜緥濡傚憳宸D锛夛紝鍥為��鍒板綋鍓嶇櫥褰曠敤鎴峰苟閲嶆柊鏌ヨ锛岄伩鍏嶅悗缁� NPE
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());
+ // 閮ㄩ棬锛氫紭鍏堝彇璇锋眰鍙傛暟锛屽叾娆″彇璐﹀彿鎵�灞為儴闂紝鏈�鍚庡厹搴� 0锛堣鍒� NOT NULL锛�
+ Long deptId = createReqVO.getDeptId() != null ? createReqVO.getDeptId()
+ : (user != null ? user.getDeptId() : null);
+ application.setDeptId(deptId != null ? deptId : 0L);
application.setStatus(HrmAuditStatusEnum.DRAFT.getStatus());
application.setHandoverStatus(HANDOVER_STATUS_NOT_STARTED);
resignationApplicationMapper.insert(application);
@@ -245,12 +252,14 @@
throw exception(RESIGNATION_APPLICATION_SUBMIT_FAIL_NOT_DRAFT);
}
validateApproveCategoryAndProcessDefinition();
- ProcessDefinition processDefinition = bpmProcessDefinitionService.getActiveProcessDefinition(processDefinitionKey);
+ // 鏈寚瀹氭祦绋嬪畾涔� Key 鏃讹紝鑷姩鍙栥�岀鑱屽鎵广�嶅垎绫讳笅鏈�鏂扮殑娲昏穬娴佺▼锛岄伩鍏嶅墠绔湭浼� key 鐩存帴鎶ョ郴缁熷紓甯�
+ String key = resolveProcessDefinitionKey(processDefinitionKey);
+ ProcessDefinition processDefinition = bpmProcessDefinitionService.getActiveProcessDefinition(key);
if (processDefinition == null) {
throw exception(RESIGNATION_APPLICATION_BPM_PROCESS_DEFINITION_NOT_EXISTS);
}
String processInstanceId = bpmProcessInstanceApi.createProcessInstance(userId, new BpmProcessInstanceCreateReqDTO()
- .setProcessDefinitionKey(processDefinitionKey).setBusinessKey(String.valueOf(id)));
+ .setProcessDefinitionKey(key).setBusinessKey(String.valueOf(id)));
resignationApplicationMapper.updateById(HrmResignationApplicationDO.builder()
.id(id)
.processInstanceId(processInstanceId)
@@ -258,6 +267,27 @@
.build());
}
+ /**
+ * 瑙ｆ瀽娴佺▼瀹氫箟 Key锛氫紭鍏堜娇鐢ㄨ皟鐢ㄦ柟浼犲叆鍊硷紝涓虹┖鏃跺彇銆岀鑱屽鎵广�嶅垎绫讳笅鏈�鏂扮殑娲昏穬娴佺▼
+ */
+ private String resolveProcessDefinitionKey(String processDefinitionKey) {
+ if (StrUtil.isNotBlank(processDefinitionKey)) {
+ return processDefinitionKey.trim();
+ }
+ List<BpmProcessDefinitionInfoDO> definitionInfoList = bpmProcessDefinitionService
+ .getProcessDefinitionInfoListByCategory(APPROVE_CATEGORY_CODE);
+ if (CollUtil.isEmpty(definitionInfoList)) {
+ throw exception(RESIGNATION_APPLICATION_BPM_PROCESS_DEFINITION_NOT_EXISTS);
+ }
+ Set<String> processDefinitionIds = convertSet(definitionInfoList, BpmProcessDefinitionInfoDO::getProcessDefinitionId);
+ List<ProcessDefinition> processDefinitions = bpmProcessDefinitionService.getProcessDefinitionList(processDefinitionIds);
+ return processDefinitions.stream()
+ .filter(pd -> !pd.isSuspended())
+ .max(Comparator.comparingInt(ProcessDefinition::getVersion))
+ .map(ProcessDefinition::getKey)
+ .orElseThrow(() -> exception(RESIGNATION_APPLICATION_BPM_PROCESS_DEFINITION_NOT_EXISTS));
+ }
+
private void validateApproveCategoryAndProcessDefinition() {
List<String> codes = Collections.singletonList(APPROVE_CATEGORY_CODE);
Map<String, ?> categoryMap = bpmCategoryService.getCategoryMap(codes);
--
Gitblit v1.9.3