|
|
@@ -112,8 +112,16 @@ public class WorkFlowUtil {
|
|
|
} else {
|
|
|
str = str.replace(WorkflowConstant.TEMPLATE_CATEGORY_PLACEHOLDER, StrUtil.toString(workflowSchema.getCategory()));
|
|
|
}
|
|
|
- }
|
|
|
|
|
|
+ }
|
|
|
+ if(str.contains(WorkflowConstant.TEMPLATE_REMARK_PLACEHOLDER) && StrUtil.isNotBlank(workflowSchema.getRemark())){ //workflowSchema.getRemark()可能为空
|
|
|
+ str = str.replace(WorkflowConstant.TEMPLATE_REMARK_PLACEHOLDER, workflowSchema.getRemark());
|
|
|
+ }
|
|
|
+ if(StrUtil.isNotBlank(post.getName())){
|
|
|
+ str.replace(WorkflowConstant.INITIATOR_POST_NAME_PLACEHOLDER, post.getName());
|
|
|
+ }else {
|
|
|
+ str.replace(WorkflowConstant.INITIATOR_POST_NAME_PLACEHOLDER, "");
|
|
|
+ }
|
|
|
return str.replace(WorkflowConstant.TEMPLATE_CODE_PLACEHOLDER, workflowSchema.getCode())
|
|
|
.replace(WorkflowConstant.TEMPLATE_NAME_PLACEHOLDER, workflowSchema.getName())
|
|
|
.replace(WorkflowConstant.TEMPLATE_REMARK_PLACEHOLDER, workflowSchema.getRemark())
|
|
|
@@ -122,7 +130,7 @@ public class WorkFlowUtil {
|
|
|
.replace(WorkflowConstant.INITIATOR_CODE_PLACEHOLDER, user.getCode())
|
|
|
.replace(WorkflowConstant.INITIATOR_MOBILE_PLACEHOLDER, user.getMobile())
|
|
|
.replace(WorkflowConstant.INITIATOR_DEPT_NAME_PLACEHOLDER, department.getName())
|
|
|
- .replace(WorkflowConstant.INITIATOR_POST_NAME_PLACEHOLDER, post.getName())
|
|
|
+// .replace(WorkflowConstant.INITIATOR_POST_NAME_PLACEHOLDER, post.getName())
|
|
|
.replace(WorkflowConstant.YYYYMMDDHHMMSS_24_PLACEHOLDER, DateUtil.format(LocalDateTime.now(), GlobalConstant.YYYY_MM_DD_HH_MM_SS_24))
|
|
|
.replace(WorkflowConstant.YYYYMMDDHHMMSS_12_PLACEHOLDER, DateUtil.format(LocalDateTime.now(), GlobalConstant.YYYY_MM_DD_HH_MM_SS_12))
|
|
|
.replace(WorkflowConstant.YYYYMMDD_PLACEHOLDER, DateUtil.format(LocalDateTime.now(), GlobalConstant.YYYY_MM_DD))
|