货主不为空取消

mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/command/CreateMaterialCommand.java

@@ -3,18 +3,19 @@ package com.linke.transport.application.service.warehouse.material.command;
 import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.math.BigDecimal;
+import lombok.Data;
+
 import javax.validation.constraints.DecimalMin;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
-import lombok.Data;
+import java.math.BigDecimal;
 
 @Data
 @ApiModel(description = "创建物料")
 public class CreateMaterialCommand {
 
   @ApiModelProperty("货主Id")
-  @NotNull(message = "货主Id不可以为空")
+  //@NotNull(message = "货主Id不可以为空")
   private Long ownerId;
 
   @ApiModelProperty("分类")
@@ -58,4 +59,4 @@ public class CreateMaterialCommand {
   private String topOrganizationId;
   /**组织相关*/
   private String organizationId;
-}
+}

mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/command/MaterialCommandService.java

@@ -26,7 +26,10 @@ public class MaterialCommandService {
    * 创建物料
    */
   public Long handle(CreateMaterialCommand command) {
-    String shipper = userServiceFeignService.findUserNameByUserId(command.getOwnerId(),"物料模块-调用RPC错误");
+    String shipper = null;
+    if (command.getOwnerId() != null) {
+      shipper = userServiceFeignService.findUserNameByUserId(command.getOwnerId(),"物料模块-调用RPC错误");
+    }
     Material material = Material.create(
         command.getOwnerId(), shipper,
         command.getCategory(),
@@ -84,4 +87,4 @@ public class MaterialCommandService {
   public int updateOwnerNameByOwnerId(Long ownerId, String ownerName) {
     return materialRepository.updateOwnerNameByOwnerId(ownerId, ownerName);
   }
-}
+}