biz-customer | 修改 | 运单查询逻辑处理

mt
2024年12月24日15:36:39

@@ -27,12 +27,11 @@ public class ConsignmentQueryUtil {
         Consignment resultConsignment = null;
         if(Objects.nonNull(consignment)){
             //uuid相同，则将运单所有信息返回给到前端
-            if(userConsignmentInfoQuery.getUserUuid().equals(consignment.getUserUuid()) ||
-                    userConsignmentInfoQuery.getShipperAccount().equals(consignment.getShipperAccount())){
+            if((Objects.nonNull(userConsignmentInfoQuery.getUserUuid()) && userConsignmentInfoQuery.getUserUuid().equals(consignment.getUserUuid())) ||
+               (Objects.nonNull(userConsignmentInfoQuery.getShipperAccount()) && userConsignmentInfoQuery.getShipperAccount().equals(consignment.getShipperAccount()))){
                 //1：如果运单UUID与登录账号UUID相同或者用户shipperAccount与运单shipperAccount相同，则显示运单、收发件人信息，以及501信息
                 resultConsignment = consignment;
-            }else if(userConsignmentInfoQuery.getShipperAccount().equals(consignment.getUserInputShipperAccount()) ||
-                userConsignmentInfoQuery.getUserId().equals(consignment.getCreateUserId())){
+            }else {
                 //如果运单UUID与登录账号UUID不同，用户shipperAccount与运单录入的shipperAccount一致，则只显示用户录入的运单号、shipperAccount、始发国
                 resultConsignment = new Consignment();
                 resultConsignment.setId(consignment.getId());