Commit 07821ba45edeb9d34c45d43d6361d612fe661c4a
1 parent
8991885d
fix:第二版财务,修复应收款,应付款内部编号查询数据的不出的bug
Showing
1 changed file
with
3 additions
and
7 deletions
src/main/java/com/order/erp/service/order/impl/OrderFieldLockApplyServiceImpl.java
... | ... | @@ -374,9 +374,7 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl<OrderFieldLockAp |
374 | 374 | } |
375 | 375 | Set<Long> orderIds = new HashSet<>(); |
376 | 376 | //由于下面是原始的代码,怕改出错了,所以我只对我需要的需求进行判断,我只针对我需要的这种情况,其他情况下就不走这种情况。 限制情况为跟单业务,对应收款,应付款,发票审核请求时。 |
377 | - if(RoleEnum.TRACKER_USER.getCode().equals(roleEnum.getCode()) && (queryVO.getType()==Constant.THIRTY || queryVO.getType()==4050)){ | |
378 | - | |
379 | - }else if(RoleEnum.BUSINESS_USER.getCode().equals(roleEnum.getCode()) && (queryVO.getType()==Constant.THIRTY || queryVO.getType()==4050)){ | |
377 | + if(queryVO.getType()==Constant.THIRTY || queryVO.getType()==4050){ | |
380 | 378 | |
381 | 379 | }else{ |
382 | 380 | /** 这部分代码是之前的,每台看懂,就先不修改了,保留*/ |
... | ... | @@ -414,7 +412,7 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl<OrderFieldLockAp |
414 | 412 | if(CollectionUtils.isNotEmpty(queryVO.getInnerNo())){ |
415 | 413 | String queryInnerNo = queryVO.getInnerNo().get(0).trim(); |
416 | 414 | queryWrapper.apply( |
417 | - "JSON_UNQUOTE(JSON_EXTRACT(fields, '$.producePaymentCheckBillFieldVO.innerNo')) = {0}", | |
415 | + "JSON_CONTAINS(JSON_EXTRACT(fields, '$.producePaymentCheckBillFieldVO.innerNo'), JSON_QUOTE({0}))", | |
418 | 416 | queryInnerNo |
419 | 417 | ); |
420 | 418 | } |
... | ... | @@ -426,7 +424,7 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl<OrderFieldLockAp |
426 | 424 | if(CollectionUtils.isNotEmpty(queryVO.getInnerNo())){ |
427 | 425 | String queryInnerNo = queryVO.getInnerNo().get(0).trim(); |
428 | 426 | queryWrapper.apply( |
429 | - "JSON_UNQUOTE(JSON_EXTRACT(fields, '$.invoiceFieldVO.innerNo')) = {0}", | |
427 | + "JSON_CONTAINS(JSON_EXTRACT(fields, '$.invoiceFieldVO.innerNo'), JSON_QUOTE({0}))", | |
430 | 428 | queryInnerNo |
431 | 429 | ); |
432 | 430 | } |
... | ... | @@ -443,7 +441,6 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl<OrderFieldLockAp |
443 | 441 | if (!invoiceNos.isEmpty()) { |
444 | 442 | // 使用参数化查询避免 SQL 拼接问题 |
445 | 443 | queryWrapper.apply( |
446 | -// "JSON_UNQUOTE(JSON_EXTRACT(fields, '$.invoiceBillOrderDO.invoiceNo')) = {0}", | |
447 | 444 | "JSON_UNQUOTE(JSON_EXTRACT(fields, '$.invoiceFieldVO.invoiceNo')) = {0}", |
448 | 445 | invoiceNos |
449 | 446 | ); |
... | ... | @@ -458,7 +455,6 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl<OrderFieldLockAp |
458 | 455 | if (!checkNos.isEmpty()) { |
459 | 456 | // 使用参数化查询避免 SQL 拼接问题 |
460 | 457 | queryWrapper.apply( |
461 | -// "JSON_UNQUOTE(JSON_EXTRACT(fields, '$.checkBillOrderDO.checkNo')) = {0}", | |
462 | 458 | "JSON_UNQUOTE(JSON_EXTRACT(fields, '$.producePaymentCheckBillFieldVO.checkNo')) = {0}", |
463 | 459 | checkNos |
464 | 460 | ); | ... | ... |