customer|流程代码调整

@@ -25,8 +25,7 @@ public interface ConsignmentExtMapper {
             ") WHERE ROWNUM = 1")
             ") WHERE ROWNUM = 1")
     Consignment findByConsignmentCode(@Param("consignmentCode") String consignmentCode, @Param("dateParam") LocalDate dateParam);
     Consignment findByConsignmentCode(@Param("consignmentCode") String consignmentCode, @Param("dateParam") LocalDate dateParam);
 
 
-    @Select("SELECT BC.* FROM T_BIZ_CONSIGNMENT BC LEFT JOIN T_BIZ_USER_CONSIGNMENT_MAPPING BUCM ON(BC.ID = BUCM.CONSIGNMENT_ID) " +
-            "WHERE BC.ID = #{query.consignmentId} AND (BC.USER_UUID = #{query.userUuid} OR BUCM.USER_ID = #{query.userId})")
+    @Select("SELECT BC.* FROM T_BIZ_CONSIGNMENT BC WHERE BC.ID = #{query.consignmentId}")
     Consignment findConsignmentInfo(@Param("query") UserConsignmentInfoQuery query);
     Consignment findConsignmentInfo(@Param("query") UserConsignmentInfoQuery query);
 
 
 }
 }

@@ -60,11 +60,11 @@ public class ConsignmentQueryServiceImpl extends BaseService implements IConsign
       * @param userConsignmentInfoQuery
       * @param userConsignmentInfoQuery
       * @return com.fedex.connect.common.dependencies.date.vo.ResponseVo
       * @return com.fedex.connect.common.dependencies.date.vo.ResponseVo
       */
       */
-    public ResponseVo findConsignmentInfo(UserConsignmentInfoQuery userConsignmentInfoQuery){
+    public ResponseVo findConsignmentInfo(UserConsignmentInfoQuery userConsignmentInfoQuery) {
         Consignment consignment = consignmentRepository.findConsignmentInfo(userConsignmentInfoQuery);
         Consignment consignment = consignmentRepository.findConsignmentInfo(userConsignmentInfoQuery);
-        if(Objects.nonNull(consignment)
-                && !consignment.getUserUuid().equals(userConsignmentInfoQuery.getUserUuid())
-                && !consignment.getShipperAccount().equals(userConsignmentInfoQuery.getShipperAccount())){
+        if (consignment != null
+                && !Objects.equals(consignment.getUserUuid(), userConsignmentInfoQuery.getUserUuid())
+                && !Objects.equals(consignment.getShipperAccount(), userConsignmentInfoQuery.getShipperAccount())) {
             Consignment consignmentTemp = new Consignment();
             Consignment consignmentTemp = new Consignment();
             consignmentTemp.setId(consignment.getId());
             consignmentTemp.setId(consignment.getId());
             consignmentTemp.setConsignmentCode(consignment.getConsignmentCode());
             consignmentTemp.setConsignmentCode(consignment.getConsignmentCode());

@@ -145,7 +145,7 @@ public class ConsignmentUtil {
         if (!StringUtils.hasText(bo.getShipperAccount())){
         if (!StringUtils.hasText(bo.getShipperAccount())){
             consignmentAddDto.setIsCreatorFlag(DigitConstants.DIGIT_TWO);
             consignmentAddDto.setIsCreatorFlag(DigitConstants.DIGIT_TWO);
             consignmentAddDto.setConsignmentId(null);
             consignmentAddDto.setConsignmentId(null);
-            return responseUtils.success(ResponseCode.MESSAGE_CODE_30012,consignmentAddDto);
+            return responseUtils.success(ResponseCode.MESSAGE_CODE_30005,consignmentAddDto);
         }
         }
 
 
         /**
         /**

@@ -46,6 +46,8 @@ public class SysUserDto {
         user.setTypeCode(dto.getTypeCode());
         user.setTypeCode(dto.getTypeCode());
         user.setUserUuid(dto.getUserUuid());
         user.setUserUuid(dto.getUserUuid());
         user.setTypeName(dto.getTypeName());
         user.setTypeName(dto.getTypeName());
+        user.setAddflag1(dto.getAddflag1());
+        user.setAddflag2(dto.getAddflag2());
         return user;
         return user;
     }
     }
 
 
@@ -69,6 +71,8 @@ public class SysUserDto {
         this.unifiedBusinessNum = null;
         this.unifiedBusinessNum = null;
         this.customsSerialNum = null;
         this.customsSerialNum = null;
         this.userUuid = uuid;
         this.userUuid = uuid;
+        this.addflag1 = 1;
+        this.addflag2 = 1;
     }
     }
 
 
     /**
     /**
@@ -167,5 +171,15 @@ public class SysUserDto {
     @JsonIgnore
     @JsonIgnore
     private String remark;
     private String remark;
 
 
+    /**
+     * ADD时弹出提示1
+     */
+    private Integer addflag1;
+
+    /**
+     * ADD时弹出提示2
+     */
+    private Integer addflag2;
+
 
 
 }
 }