aps-订单评审合并表单保存和流程事务

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsProductionOrderServiceImpl.java

@@ -1072,6 +1072,7 @@ public class ApsProductionOrderServiceImpl extends ServiceImpl<ApsProductionOrde
         }
         //发起流程
         if (req.getIsStartWf()) {
+            SysUserVo currentUser = CXCommonUtils.getCurrentUser();
             ApsProductionOrderDo oldOrder = req.getOldOrder();
             CreateProcessVo createProcessVo = new CreateProcessVo();
             createProcessVo.setProcessdefid("order_review");
@@ -1079,10 +1080,10 @@ public class ApsProductionOrderServiceImpl extends ServiceImpl<ApsProductionOrde
             createProcessVo.setBusinesstableid(oldOrder.getId());
             createProcessVo.setProcessname("订单评审");
             createProcessVo.setProcesstitle(oldOrder.getOrderno() + "-订单评审-" + DateUtil.now());
-            createProcessVo.setUserId(oldOrder.getId());
+            createProcessVo.setUserId(currentUser.getId());
             createProcessVo.setNotifycontent("订单评审");
             //查询订单信息，map格式返回
-            Map<String, Object> map = this.getMap(new LambdaQueryWrapper<ApsProductionOrderDo>().eq(ApsProductionOrderDo::getId, oldOrder.getId()));
+            Map<String, Object> map = this.baseMapper.getMapById(oldOrder.getId());
             createProcessVo.setBusinesstableValue(map);
             try {
                 workFlowService.createProcessInstance(createProcessVo);