1、查询回显时字典数据map集合的key调整

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/entry/OaEntryServiceImpl.java

@@ -592,7 +592,7 @@ public class OaEntryServiceImpl implements OaEntryService {
         // 员工类型
         if (StrUtil.isNotBlank(oaEntryDO.getEmployeeType())) {
             List<DictDataTenantRespDTO> dictDataList = dictDataTenantApi.getDictDataList(DictTypeTenantEnum.TENANT_EMPLOYEE_TYPE.getType());
-            Map<String, String> dictDataMap = CollectionUtils.convertMap(dictDataList, DictDataTenantRespDTO::getDictType, DictDataTenantRespDTO::getLabel);
+            Map<String, String> dictDataMap = CollectionUtils.convertMap(dictDataList, DictDataTenantRespDTO::getValue, DictDataTenantRespDTO::getLabel);
             String employeeTypeDesc = dictDataMap.get(oaEntryDO.getEmployeeType());
             if (StrUtil.isNotBlank(employeeTypeDesc)) {
                 oaEntryRespVO.setEmployeeTypeDesc(employeeTypeDesc);
@@ -718,7 +718,7 @@ public class OaEntryServiceImpl implements OaEntryService {
                     .collect(Collectors.toMap(OaAuditStatusEnum::getStatus, OaAuditStatusEnum::getStatusDesc));
             // 员工类型
             List<DictDataTenantRespDTO> dictDataList = dictDataTenantApi.getDictDataList(DictTypeTenantEnum.TENANT_EMPLOYEE_TYPE.getType());
-            Map<String, String> dictDataMap = CollectionUtils.convertMap(dictDataList, DictDataTenantRespDTO::getDictType, DictDataTenantRespDTO::getLabel);
+            Map<String, String> dictDataMap = CollectionUtils.convertMap(dictDataList, DictDataTenantRespDTO::getValue, DictDataTenantRespDTO::getLabel);
 
             for (OaEntryRespVO respVO : oaEntryRespVOList) {
                 // 当前处理人

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/leave/OaLeaveServiceImpl.java

@@ -697,7 +697,7 @@ public class OaLeaveServiceImpl implements OaLeaveService {
         // 请假类型
         if (StrUtil.isNotBlank(oaLeaveDO.getLeaveType())) {
             List<DictDataTenantRespDTO> dictDataList = dictDataTenantApi.getDictDataList(DictTypeTenantEnum.TENANT_LEAVE_TYPE.getType());
-            Map<String, String> dictDataMap = CollectionUtils.convertMap(dictDataList, DictDataTenantRespDTO::getDictType, DictDataTenantRespDTO::getLabel);
+            Map<String, String> dictDataMap = CollectionUtils.convertMap(dictDataList, DictDataTenantRespDTO::getValue, DictDataTenantRespDTO::getLabel);
             String leaveTypeDesc = dictDataMap.get(oaLeaveDO.getLeaveType());
             if (StrUtil.isNotBlank(leaveTypeDesc)) {
                 oaLeaveRespVO.setLeaveTypeDesc(leaveTypeDesc);
@@ -836,7 +836,7 @@ public class OaLeaveServiceImpl implements OaLeaveService {
 
             // 请假类型
             List<DictDataTenantRespDTO> dictDataList = dictDataTenantApi.getDictDataList(DictTypeTenantEnum.TENANT_LEAVE_TYPE.getType());
-            Map<String, String> dictDataMap = CollectionUtils.convertMap(dictDataList, DictDataTenantRespDTO::getDictType, DictDataTenantRespDTO::getLabel);
+            Map<String, String> dictDataMap = CollectionUtils.convertMap(dictDataList, DictDataTenantRespDTO::getValue, DictDataTenantRespDTO::getLabel);
 
 
             for (OaLeaveRespVO respVO : oaLeaveRespVOList) {

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/turnover/OaTurnoverServiceImpl.java

@@ -679,7 +679,7 @@ public class OaTurnoverServiceImpl implements OaTurnoverService {
         // 离职原因
         if (StrUtil.isNotBlank(oaTurnoverDO.getTurnoverReason())) {
             List<DictDataTenantRespDTO> dictDataList = dictDataTenantApi.getDictDataList(DictTypeTenantEnum.TENANT_TURNOVER_REASON.getType());
-            Map<String, String> dictDataMap = CollectionUtils.convertMap(dictDataList, DictDataTenantRespDTO::getDictType, DictDataTenantRespDTO::getLabel);
+            Map<String, String> dictDataMap = CollectionUtils.convertMap(dictDataList, DictDataTenantRespDTO::getValue, DictDataTenantRespDTO::getLabel);
             String turnoverReasonDesc = dictDataMap.get(oaTurnoverDO.getTurnoverReason());
             if (StrUtil.isNotBlank(turnoverReasonDesc)) {
                 oaTurnoverRespVO.setTurnoverReasonDesc(turnoverReasonDesc);
@@ -806,7 +806,7 @@ public class OaTurnoverServiceImpl implements OaTurnoverService {
 
             // 离职原因
             List<DictDataTenantRespDTO> dictDataList = dictDataTenantApi.getDictDataList(DictTypeTenantEnum.TENANT_TURNOVER_REASON.getType());
-            Map<String, String> dictDataMap = CollectionUtils.convertMap(dictDataList, DictDataTenantRespDTO::getDictType, DictDataTenantRespDTO::getLabel);
+            Map<String, String> dictDataMap = CollectionUtils.convertMap(dictDataList, DictDataTenantRespDTO::getValue, DictDataTenantRespDTO::getLabel);
 
 
             for (OaTurnoverRespVO respVO : oaTurnoverRespVOList) {