Fedex / iClear-Connect-Pre-Clearance

Go to a project
Toggle navigation Toggle navigation pinning
tao.mo
9029f78c 2 parents b4948e6e 341d9ae5

Merge remote-tracking branch 'origin/master'

Inline Side-by-side
Showing 1 changed file with 2 additions and 1 deletions
...@@ -46,7 +46,8 @@ public class ConsignmentRepositoryImpl extends BaseDao implements IConsignmentRe ...@@ -46,7 +46,8 @@ public class ConsignmentRepositoryImpl extends BaseDao implements IConsignmentRe
46 if (SystemDefaultUserConstants.SYSTEM_USER_KEYS.USER_NAME.equals(consignment.getCreateUserName())){ 46 if (SystemDefaultUserConstants.SYSTEM_USER_KEYS.USER_NAME.equals(consignment.getCreateUserName())){
47 consignment.setCreateUserName(user.getUserName()); 47 consignment.setCreateUserName(user.getUserName());
48 } 48 }
49 - if (!user.getUserUuid().equals(consignment.getUserUuid()) && (!StringUtils.isEmpty(user.getAccountNo()) && !user.getAccountNo().equals(consignment.getShipperAccount()))){ 49 + if (!user.getUserUuid().equals(consignment.getUserUuid()) && (!StringUtils.isEmpty(user.getAccountNo()) && !user.getAccountNo().equals(consignment.getShipperAccount()))
50 + && (!StringUtils.isEmpty(consignment.getUserInputShipperAccount()) && !consignment.getUserInputShipperAccount().equals(consignment.getShipperAccount()))){
50 consignment.setRecipientContactName(null); 51 consignment.setRecipientContactName(null);
51 consignment.setRecipientCompany(null); 52 consignment.setRecipientCompany(null);
52 consignment.setDocNondocFlag(null); 53 consignment.setDocNondocFlag(null);
......