Ver código fonte

表单详情用户名替换正式姓名

fuyuchuan 3 semanas atrás
pai
commit
7592d614e4

+ 7 - 2
flow-workflow/flow-workflow-biz/src/main/java/com/flow/service/impl/FlowActivityServiceImpl.java

@@ -9,6 +9,7 @@ import com.flow.enums.ApprovalMultiEnum;
 import com.flow.service.FlowActivityService;
 import com.flow.service.FlowDefineService;
 import com.flow.service.FlowTaskService;
+import com.flow.service.UserService;
 import org.flowable.engine.HistoryService;
 import org.flowable.engine.RuntimeService;
 import org.flowable.engine.history.HistoricActivityInstance;
@@ -34,6 +35,8 @@ public class FlowActivityServiceImpl implements FlowActivityService {
     private RuntimeService runtimeService;
     @Autowired
     private HistoryService historyService;
+    @Autowired
+    private UserService userService;
 
     @Override
     public List<FlowActivity> records(String instanceId) {
@@ -58,7 +61,8 @@ public class FlowActivityServiceImpl implements FlowActivityService {
                         optional.ifPresent(flowTask -> flowActivity.setStatus(flowTask.getStatus()));
                         String assignee = flowActivity.getAssignee();
                         if (Objects.isNull(assignee)) {
-                            flowActivity.setAssignee(processInstance.getStartUserId());
+                            // flowActivity.setAssignee(processInstance.getStartUserId());
+                            flowActivity.setAssignee(userService.getByUsername(processInstance.getStartUserId()).getName());
                         }
                         ApprovalNode approvalNode = flowDefine.findFlowNodeOfType(ApprovalNode.class, e.getActivityId());
                         if (Objects.nonNull(approvalNode)) {
@@ -68,7 +72,8 @@ public class FlowActivityServiceImpl implements FlowActivityService {
                     } else if ("copyServiceTask".equals(flowActivity.getActivityType())) {
                         flowActivity.setMulti(ApprovalMultiEnum.JOINT);
                     } else if ("startEvent".equals(flowActivity.getActivityType())) {
-                        flowActivity.setAssignee(processInstance.getStartUserId());
+                        // flowActivity.setAssignee(processInstance.getStartUserId());
+                        flowActivity.setAssignee(userService.getByUsername(processInstance.getStartUserId()).getName());
                     } else if ("jumpServiceTask".equals(flowActivity.getActivityType())) {
                         flowActivity.setAssignee("admin");
                         if (StringUtils.isBlank(flowActivity.getDeleteReason())) {