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

@@ -21,9 +21,10 @@ import com.lframework.starter.web.core.annotations.oplog.OpLog;
 import com.lframework.starter.web.core.utils.PageHelperUtil;
 import com.lframework.starter.common.utils.Assert;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
+import com.lframework.xingyun.basedata.entity.Workshop;
+import com.lframework.xingyun.basedata.service.workshop.WorkshopService;
 import com.lframework.xingyun.sc.entity.CustomerCredit;
 import com.lframework.xingyun.sc.entity.PurchaseOrderInfo;
-import com.lframework.xingyun.sc.entity.PurchaseOrderLine;
 import com.lframework.xingyun.sc.enums.OrderSpecChangeStatus;
 import com.lframework.xingyun.sc.mappers.PurchaseOrderInfoMapper;
 import com.lframework.xingyun.sc.service.customer.CustomerCreditService;
@@ -53,6 +54,8 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
     private FlowInstanceWrapperService flowInstanceWrapperService;
     @Resource
     private FlowTaskWrapperMapper flowTaskWrapperMapper;
+    @Resource
+    private WorkshopService workshopService;
 
     @Override
     public PageResult<PurchaseOrderInfo> query(Integer pageIndex, Integer pageSize, QueryPurchaseOrderInfoVo vo) {
@@ -235,6 +238,12 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
         }
         //开启审核
         data.setUserId(SecurityUtil.getCurrentUser().getId());
+        if (StringUtils.isNotEmpty(data.getWorkshopId())) {
+            Workshop workshop = workshopService.findById(data.getWorkshopId());
+            if (workshop != null) {
+                data.setWorkshopName(workshop.getName());
+            }
+        }
         flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, data);
 
         return data.getId();
@@ -293,6 +302,12 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
         OpLogUtil.setExtra(vo);
         //开启审核
         data.setUserId(SecurityUtil.getCurrentUser().getId());
+        if (StringUtils.isNotEmpty(data.getWorkshopId())) {
+            Workshop workshop = workshopService.findById(data.getWorkshopId());
+            if (workshop != null) {
+                data.setWorkshopName(workshop.getName());
+            }
+        }
         flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, data);
     }