Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xjrsoft/module/workflow/utils/WorkFlowUtil.java

@@ -135,8 +135,8 @@ public class WorkFlowUtil {
                 .replace(WorkflowConstant.TASK_ID_PLACEHOLDER, workflowSchema.getDefinitionId())
                 .replace(WorkflowConstant.INITIATOR_ID_PLACEHOLDER, StrUtil.toString(user.getId()))
                 .replace(WorkflowConstant.INITIATOR_USER_NAME_PLACEHOLDER, user.getName())
-                .replace(WorkflowConstant.INITIATOR_CODE_PLACEHOLDER, user.getCode())
-                .replace(WorkflowConstant.INITIATOR_MOBILE_PLACEHOLDER, user.getMobile())
+                .replace(WorkflowConstant.INITIATOR_CODE_PLACEHOLDER, user.getCode()==null?"":user.getCode())
+                .replace(WorkflowConstant.INITIATOR_MOBILE_PLACEHOLDER, user.getMobile()==null?"":user.getMobile())
                 .replace(WorkflowConstant.INITIATOR_DEPT_NAME_PLACEHOLDER, department.getName()==null?"":department.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))