楚江ERP:草稿要车单-业务员（合同创建人）可修改

@@ -11,6 +11,8 @@ import com.lframework.starter.web.core.controller.DefaultBaseController;
 import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.xingyun.sc.bo.shipments.car.GetDraftRequestCarTicketBo;
 import com.lframework.xingyun.sc.bo.shipments.car.GetDraftRequestCarTicketBo;
 import com.lframework.xingyun.sc.entity.DraftRequestCarTicket;
 import com.lframework.xingyun.sc.entity.DraftRequestCarTicket;
+import com.lframework.xingyun.sc.entity.PurchaseOrderInfo;
+import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
 import com.lframework.xingyun.sc.service.shipments.car.DraftRequestCarTicketService;
 import com.lframework.xingyun.sc.service.shipments.car.DraftRequestCarTicketService;
 import com.lframework.xingyun.sc.vo.shipments.car.*;
 import com.lframework.xingyun.sc.vo.shipments.car.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
@@ -20,6 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 
 
+import javax.annotation.Resource;
 import javax.validation.Valid;
 import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotBlank;
 import java.util.List;
 import java.util.List;
@@ -37,7 +40,8 @@ public class DraftRequestCarTicketController extends DefaultBaseController {
 
 
     @Autowired
     @Autowired
     private DraftRequestCarTicketService draftRequestCarTicketService;
     private DraftRequestCarTicketService draftRequestCarTicketService;
-
+    @Resource
+    private PurchaseOrderInfoService purchaseOrderInfoService;
     /**
     /**
      * 查询列表
      * 查询列表
      */
      */
@@ -56,9 +60,10 @@ public class DraftRequestCarTicketController extends DefaultBaseController {
 
 
             results = datas.stream().map(draftRequestCarTicket -> {
             results = datas.stream().map(draftRequestCarTicket -> {
                 GetDraftRequestCarTicketBo bo = new GetDraftRequestCarTicketBo(draftRequestCarTicket);
                 GetDraftRequestCarTicketBo bo = new GetDraftRequestCarTicketBo(draftRequestCarTicket);
+                PurchaseOrderInfo purchaseOrderInfo = purchaseOrderInfoService.findById(draftRequestCarTicket.getPurchaseOrderId());
                 // 判断 createById 是否等于当前用户 ID
                 // 判断 createById 是否等于当前用户 ID
                 boolean isCreateBy = false;
                 boolean isCreateBy = false;
-                if (currentUserId.equals(draftRequestCarTicket.getCreateById())) {
+                if (purchaseOrderInfo != null && currentUserId.equals(purchaseOrderInfo.getContractCreateById())) {
                     isCreateBy = true;
                     isCreateBy = true;
                 }
                 }
                 bo.setDraftCreateBy(isCreateBy);
                 bo.setDraftCreateBy(isCreateBy);