凯和审批修改

ruoyi-warehouse/src/main/java/com/ruoyi/approvalFlow/service/impl/AuditPathsServiceImpl.java

@@ -493,7 +493,7 @@ public class AuditPathsServiceImpl implements IAuditPathsService {
                         }
                         // 查询财务状态
                         TFee tFee = tFeeMapper.selectTFeeById(auditItems.getBillId());
-                        if (!"4".equals(tFee.getfBillstatus()) || !"5".equals(tFee.getfBillstatus())) {
+                        if (!"4".equals(tFee.getfBillstatus()) && !"5".equals(tFee.getfBillstatus())) {
                             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                             return AjaxResult.error("审批通过失败: 数据已操作");
                         }
@@ -832,7 +832,7 @@ public class AuditPathsServiceImpl implements IAuditPathsService {
             }
             // 查询财务状态
             TFee tFee = tFeeMapper.selectTFeeById(auditItems.getBillId());
-            if (!"4".equals(tFee.getfBillstatus()) || !"5".equals(tFee.getfBillstatus())) {
+            if (!"4".equals(tFee.getfBillstatus())  && !"5".equals(tFee.getfBillstatus())) {
                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                 return AjaxResult.error("审批驳回失败: 数据已操作");
             }