github
/
jeecg-boot
mirror of https://github.com/jeecgboot/jeecg-boot
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #152 from LQYBill/fix/poProductAvailableNull 

fix: null error /completeFeesEstimation
pull/8523/head
Qiuyi LI 2025-04-17 14:36:04 +02:00 committed by GitHub
parent d8b51d3a90 333c278317
commit d44ad24c9e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroRealm.java
View File

@ -106,7 +106,7 @@ public class ShiroRealm extends AuthorizingRealm {
loginUser = this.checkUserTokenIsEffect(token); loginUser = this.checkUserTokenIsEffect(token);
} catch (AuthenticationException e) { } catch (AuthenticationException e) {
JwtUtil.responseError(SpringContextUtils.getHttpServletResponse(),401,e.getMessage()); JwtUtil.responseError(SpringContextUtils.getHttpServletResponse(),401,e.getMessage());
e.printStackTrace(); //e.printStackTrace();
return null; return null;
} }
return new SimpleAuthenticationInfo(loginUser, token, getName()); return new SimpleAuthenticationInfo(loginUser, token, getName());

2
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/shippingInvoice/InvoiceController.java
View File

@ -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 // 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() List<String> orderIdsWithProductUnavailable = entry.getValue().stream()
.filter( .filter(
order -> order.getProductAvailable().equals("0") order -> (order.getProductAvailable() == null || order.getProductAvailable().equals("0"))
&& order.getPurchaseInvoiceNumber() == null && order.getPurchaseInvoiceNumber() == null
&& order.getVirtualProductAvailable().equals("0")) && order.getVirtualProductAvailable().equals("0"))
.map(PlatformOrder::getId).collect(Collectors.toList()); .map(PlatformOrder::getId).collect(Collectors.toList());