diff --git a/src/com/engine/salary/entity/salaryBill/bo/SalaryBillItemNameBO.java b/src/com/engine/salary/entity/salaryBill/bo/SalaryBillItemNameBO.java index ce1deaf67..4ad320496 100644 --- a/src/com/engine/salary/entity/salaryBill/bo/SalaryBillItemNameBO.java +++ b/src/com/engine/salary/entity/salaryBill/bo/SalaryBillItemNameBO.java @@ -1,5 +1,6 @@ package com.engine.salary.entity.salaryBill.bo; +import cn.hutool.core.codec.Base64Encoder; import com.engine.salary.entity.salaryBill.dto.SalaryBillItemNameDTO; import com.engine.salary.entity.salaryBill.po.SalaryBillItemNamePO; import org.apache.commons.collections4.CollectionUtils; @@ -23,7 +24,7 @@ public class SalaryBillItemNameBO { return SalaryBillItemNamePOList.stream() .map(po -> SalaryBillItemNameDTO.builder() .salaryItemId(po.getSalaryItemId()) - .salaryItemShowName(po.getSalaryItemShowName()) + .salaryItemShowName("base64_" + Base64Encoder.encode(po.getSalaryItemShowName())) .build()) .collect(Collectors.toList()); } diff --git a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java index 2a0054536..716e76571 100644 --- a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java @@ -605,11 +605,14 @@ public class SalarySendServiceImpl extends Service implements SalarySendService } for (SalaryTemplateSalaryItemSetListDTO setListDTO : itemSetListDTOS) { if (StringUtils.isNotBlank(groupNameMap.get(setListDTO.getGroupId()))) { - setListDTO.setGroupName(groupNameMap.get(setListDTO.getGroupId())); +// setListDTO.setGroupName(groupNameMap.get(setListDTO.getGroupId())); + setListDTO.setGroupName(Util.formatMultiLang(setListDTO.getGroupName(), String.valueOf(user.getLanguage()))); } for (SalaryTemplateSalaryItemListDTO dto : setListDTO.getItems()) { if (salaryIdNameMap.get(dto.getSalaryItemId()) != null) { - dto.setName(salaryIdNameMap.get(dto.getSalaryItemId())); +// dto.setName(salaryIdNameMap.get(dto.getSalaryItemId())); + dto.setName(Util.formatMultiLang(dto.getName(), String.valueOf(user.getLanguage()))); + dto.setSalaryItemShowName(Util.formatMultiLang(dto.getSalaryItemShowName(), String.valueOf(user.getLanguage()))); } } } diff --git a/src/com/engine/salary/wrapper/SalaryTemplateWrapper.java b/src/com/engine/salary/wrapper/SalaryTemplateWrapper.java index 49ef2811d..746df694d 100644 --- a/src/com/engine/salary/wrapper/SalaryTemplateWrapper.java +++ b/src/com/engine/salary/wrapper/SalaryTemplateWrapper.java @@ -346,10 +346,14 @@ public class SalaryTemplateWrapper extends Service { item.setOriginName(itemIdNameMap.getOrDefault(salaryItemId, item.getName())); if(itemShowNameMap.containsKey(salaryItemId)){ item.setSalaryItemShowName(itemShowNameMap.get(salaryItemId)); - item.setName(itemShowNameMap.get(salaryItemId) + "(" + itemIdNameMap.getOrDefault(salaryItemId, item.getName()) +")"); +// item.setName(itemShowNameMap.get(salaryItemId) + "(" + itemIdNameMap.getOrDefault(salaryItemId, item.getName()) +")"); + item.setName("base64_" + Base64Encoder.encode(itemShowNameMap.get(salaryItemId) + "(" + item.getName() +")")); + item.setSalaryItemShowName("base64_" + Base64Encoder.encode(item.getSalaryItemShowName())); }else{ item.setSalaryItemShowName(itemIdNameMap.getOrDefault(salaryItemId, item.getName())); - item.setName(itemIdNameMap.getOrDefault(salaryItemId, item.getName())); +// item.setName(itemIdNameMap.getOrDefault(salaryItemId, item.getName())); + item.setName("base64_" + Base64Encoder.encode(item.getName())); + item.setSalaryItemShowName("base64_" + Base64Encoder.encode(item.getSalaryItemShowName())); } }); } else { @@ -590,10 +594,12 @@ public class SalaryTemplateWrapper extends Service { item.setOriginName(itemIdNameMap.getOrDefault(salaryItemId, item.getName())); if(itemShowNameMap.containsKey(salaryItemId)){ item.setSalaryItemShowName(itemShowNameMap.get(salaryItemId)); - item.setName(itemShowNameMap.get(salaryItemId) + "(" + itemIdNameMap.getOrDefault(salaryItemId, item.getName()) + ")"); +// item.setName(itemShowNameMap.get(salaryItemId) + "(" + itemIdNameMap.getOrDefault(salaryItemId, item.getName()) + ")"); + item.setName("base64_" + Base64Encoder.encode(itemShowNameMap.get(salaryItemId) + "(" + item.getName() +")")); }else{ item.setSalaryItemShowName(itemIdNameMap.getOrDefault(salaryItemId, item.getName())); - item.setName(itemIdNameMap.getOrDefault(salaryItemId, item.getName())); +// item.setName(itemIdNameMap.getOrDefault(salaryItemId, item.getName())); + item.setName("base64_" + Base64Encoder.encode(item.getName())); } }); } else {