|
@@ -474,7 +474,7 @@ public class FixedFlowController extends BladeController {
|
|
|
}
|
|
|
FixedFlowLink fixedFlowLink = new FixedFlowLink();
|
|
|
fixedFlowLink.setFixedFlowId(fixedFlowId);
|
|
|
- fixedFlowLink.setFixedFlowLink(dto.getFixedName());
|
|
|
+ fixedFlowLink.setFixedFlowLink(fixedBranch.getName() != null ? fixedBranch.getName() : dto.getFixedName());
|
|
|
fixedFlowLink.setFixedFlowLinkType(projectInfo.getApprovalType());
|
|
|
fixedFlowLink.setFixedFlowLinkUser(Long.parseLong(userId));
|
|
|
fixedFlowLink.setFixedFlowLinkUserName(user.getRealName());
|