diff --git a/src/com/engine/salary/service/impl/SalaryBillBaseSetServiceImpl.java b/src/com/engine/salary/service/impl/SalaryBillBaseSetServiceImpl.java
index 12bbbae2f..28d96c728 100644
--- a/src/com/engine/salary/service/impl/SalaryBillBaseSetServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryBillBaseSetServiceImpl.java
@@ -73,6 +73,7 @@ public class SalaryBillBaseSetServiceImpl extends Service implements SalaryBillB
wmSetting = JsonUtil.toJsonString(saveParam.getWmSetting());
}else{
// 系统默认水印 给一个默认的json
+ wmSetting = "{\"wmWidth\":100,\"wmRotate\":30,\"wmSelectedFieldIds\":[\"HRM_Name\"],\"pureWmText\":\" 当前操作者姓名 \",\"wmText\":\"
$HRM_Name
\",\"wmClassify\":\"text\",\"wmHeight\":100,\"wmOriginText\":\" 当前操作者姓名
\",\"wmNoTransparent\":15}";
}
watermark = saveParam.getWatermark().getValue();
} else {
diff --git a/src/com/engine/salary/service/impl/SalaryBillServiceImpl.java b/src/com/engine/salary/service/impl/SalaryBillServiceImpl.java
index a7c6c21db..8700fb87f 100644
--- a/src/com/engine/salary/service/impl/SalaryBillServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryBillServiceImpl.java
@@ -621,8 +621,9 @@ public class SalaryBillServiceImpl extends Service implements SalaryBillService
* @param salaryTemplate
*/
private void grantSendInfo(List ids, SalarySendPO salarySend, SalaryTemplatePO salaryTemplate, SalaryBillSendDTO salaryBillSendDTO) {
+ String waterMarkJson = salaryBillSendDTO.getWatermarkSetting() == null ? "" : JsonUtil.toJsonString(salaryBillSendDTO.getWatermarkSetting());
// 水印设置
- salaryTemplate.setSalaryWatermark(JsonUtil.toJsonString(salaryBillSendDTO.getWatermarkSetting()));
+ salaryTemplate.setSalaryWatermark(waterMarkJson);
List> partition = Lists.partition(ids, 500);
Date sendTime = new Date();
diff --git a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java
index 4cb22ee32..19281ed19 100644
--- a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java
@@ -574,7 +574,7 @@ public class SalarySendServiceImpl extends Service implements SalarySendService
salaryTemplate.setTheme(getBillTitle(salaryTemplate.getTheme(), salaryMonth, currentEmployeeId));
// 工资单水印文本型动态变量 == 处理
- handleSalaryWatermark(salaryTemplate, salarySendInfo);
+ handleSalaryWatermark(salaryTemplate, salarySendInfo, currentEmployeeId);
map.put("salaryTemplate", salaryTemplate);
map.put("salaryAcctResult", salaryAcctResultS);
@@ -588,7 +588,7 @@ public class SalarySendServiceImpl extends Service implements SalarySendService
* @param salaryTemplate
* @param salarySendInfo
*/
- private void handleSalaryWatermark(SalaryTemplatePO salaryTemplate, SalarySendInfoPO salarySendInfo) {
+ private void handleSalaryWatermark(SalaryTemplatePO salaryTemplate, SalarySendInfoPO salarySendInfo, Long currentEmployeeId) {
SalaryBillWatermarkDTO salaryBillWatermark = JsonUtil.parseObject(salaryTemplate.getSalaryWatermark(), SalaryBillWatermarkDTO.class);
if (Objects.isNull(salaryBillWatermark) || !salaryBillWatermark.getWatermarkStatus() ) {
return;
@@ -602,7 +602,7 @@ public class SalarySendServiceImpl extends Service implements SalarySendService
boolean needQueryEmp = (boolean) salaryBillWatermark.getWmSetting().getOrDefault("needQueryEmp", false);
DataCollectionEmployee simpleEmployee = null;
if (needQueryEmp) {
- simpleEmployee = getSalaryEmployeeService(user).getEmployeeById(salarySendInfo.getEmployeeId());
+ simpleEmployee = getSalaryEmployeeService(user).getEmployeeById(currentEmployeeId);
}
String wmText = salaryBillWatermark.getWmSetting().getOrDefault("wmText", StringUtils.EMPTY).toString();