mirror of https://github.com/jeecgboot/jeecg-boot
Merge pull request #152 from LQYBill/fix/poProductAvailableNull
fix: null error /completeFeesEstimationpull/8523/head
commit
d44ad24c9e
|
@ -106,7 +106,7 @@ public class ShiroRealm extends AuthorizingRealm {
|
|||
loginUser = this.checkUserTokenIsEffect(token);
|
||||
} catch (AuthenticationException e) {
|
||||
JwtUtil.responseError(SpringContextUtils.getHttpServletResponse(),401,e.getMessage());
|
||||
e.printStackTrace();
|
||||
//e.printStackTrace();
|
||||
return null;
|
||||
}
|
||||
return new SimpleAuthenticationInfo(loginUser, token, getName());
|
||||
|
|
|
@ -920,7 +920,7 @@ public class InvoiceController {
|
|||
// only calculate purchase estimation if products are not available and purchaseInvoiceNumber is null, else it's already been paid
|
||||
List<String> orderIdsWithProductUnavailable = entry.getValue().stream()
|
||||
.filter(
|
||||
order -> order.getProductAvailable().equals("0")
|
||||
order -> (order.getProductAvailable() == null || order.getProductAvailable().equals("0"))
|
||||
&& order.getPurchaseInvoiceNumber() == null
|
||||
&& order.getVirtualProductAvailable().equals("0"))
|
||||
.map(PlatformOrder::getId).collect(Collectors.toList());
|
||||
|
|
Loading…
Reference in New Issue