fix:第二版财务,修复应收款,应付款内部编号查询数据的不出的bug

chenhang4442024
1 parent 8991885d
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&lt;OrderFieldLockAp
         }
         Set<Long> orderIds = new HashSet<>();
         //由于下面是原始的代码,怕改出错了,所以我只对我需要的需求进行判断,我只针对我需要的这种情况,其他情况下就不走这种情况。   限制情况为跟单业务,对应收款,应付款,发票审核请求时。
-        if(RoleEnum.TRACKER_USER.getCode().equals(roleEnum.getCode()) && (queryVO.getType()==Constant.THIRTY || queryVO.getType()==4050)){
-
-        }else if(RoleEnum.BUSINESS_USER.getCode().equals(roleEnum.getCode()) && (queryVO.getType()==Constant.THIRTY || queryVO.getType()==4050)){
+        if(queryVO.getType()==Constant.THIRTY || queryVO.getType()==4050){
         }else{
             /** 这部分代码是之前的,每台看懂,就先不修改了,保留*/
@@ -414,7 +412,7 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
                 if(CollectionUtils.isNotEmpty(queryVO.getInnerNo())){
                     String queryInnerNo = queryVO.getInnerNo().get(0).trim();
                     queryWrapper.apply(
-                            "JSON_UNQUOTE(JSON_EXTRACT(fields, '$.producePaymentCheckBillFieldVO.innerNo')) = {0}",
+                            "JSON_CONTAINS(JSON_EXTRACT(fields, '$.producePaymentCheckBillFieldVO.innerNo'), JSON_QUOTE({0}))",
                             queryInnerNo
                     );
                 }
@@ -426,7 +424,7 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
                     if(CollectionUtils.isNotEmpty(queryVO.getInnerNo())){
                         String queryInnerNo = queryVO.getInnerNo().get(0).trim();
                         queryWrapper.apply(
-                                "JSON_UNQUOTE(JSON_EXTRACT(fields, '$.invoiceFieldVO.innerNo')) = {0}",
+                                "JSON_CONTAINS(JSON_EXTRACT(fields, '$.invoiceFieldVO.innerNo'), JSON_QUOTE({0}))",
                                 queryInnerNo
                         );
                     }
@@ -443,7 +441,6 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
             if (!invoiceNos.isEmpty()) {
                 // 使用参数化查询避免 SQL 拼接问题
                 queryWrapper.apply(
-//                        "JSON_UNQUOTE(JSON_EXTRACT(fields, '$.invoiceBillOrderDO.invoiceNo')) = {0}",
                          "JSON_UNQUOTE(JSON_EXTRACT(fields, '$.invoiceFieldVO.invoiceNo')) = {0}",
                         invoiceNos
                 );
@@ -458,7 +455,6 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
             if (!checkNos.isEmpty()) {
                 // 使用参数化查询避免 SQL 拼接问题
                 queryWrapper.apply(
-//                        "JSON_UNQUOTE(JSON_EXTRACT(fields, '$.checkBillOrderDO.checkNo')) = {0}",
                           "JSON_UNQUOTE(JSON_EXTRACT(fields, '$.producePaymentCheckBillFieldVO.checkNo')) = {0}",
                         checkNos
                 );