diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroRealm.java b/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroRealm.java index 85111bfbd..d809c7a85 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroRealm.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroRealm.java @@ -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()); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/shippingInvoice/InvoiceController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/shippingInvoice/InvoiceController.java index e8f396246..f60331ca7 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/shippingInvoice/InvoiceController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/shippingInvoice/InvoiceController.java @@ -911,7 +911,7 @@ public class InvoiceController { // only calculate purchase estimation if products are not available and purchaseInvoiceNumber is null, else it's already been paid List 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());