From bfca328b9bf848b0bc4690e128b718d6d407aac4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=98=89=E4=BC=9F?= <1724121454@qq.com>
Date: Sun, 26 Sep 2021 10:28:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=EF=BC=8C=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E6=8F=90=E6=8A=A5bug=EF=BC=8C=EF=BC=88?=
 =?UTF-8?q?=E4=BB=8E=E8=AE=BE=E5=A4=87=E7=82=B9=E6=A3=80=E8=B7=B3=E8=BF=87?=
 =?UTF-8?q?=E6=9D=A5object=E4=B9=9F=E6=9C=89=E5=8F=AF=E8=83=BD=E4=B8=8D?=
 =?UTF-8?q?=E4=B8=BA=E7=A9=BA=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java  | 3 +++
 anomaly/src/main/resources/mapper/ReportMapper.xml            | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java
index 6b827b78..27b469f0 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java
@@ -915,6 +915,9 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
         String user = CommonMethods.getUser();
         LocalDateTime now = LocalDateTime.now();
         AbnormalBill abnormalBill = getById(HandleEnum.ABNORMAL_BILL.getHandle(site, abnormalNo));
+        if(abnormalBill == null){
+            return ;
+        }
         if(!Constants.RESPONSE.equals(abnormalBill.getStatus())){
             throw new BaseException("状态不在响应中，请重新检索");
         }
diff --git a/anomaly/src/main/resources/mapper/ReportMapper.xml b/anomaly/src/main/resources/mapper/ReportMapper.xml
index f1874dcc..f7db0326 100644
--- a/anomaly/src/main/resources/mapper/ReportMapper.xml
+++ b/anomaly/src/main/resources/mapper/ReportMapper.xml
@@ -85,6 +85,10 @@
                 <if test="param.item != null and param.item != ''">
                     AND (I.ITEM = #{param.item} OR IT.DESCRIPTION = #{param.item})
                 </if>
+                <if test="param.currentOperation != null and param.currentOperation != ''">
+                    AND (OT2.DESCRIPTION LIKE '%${param.currentOperation}%' OR
+                    O2.OPERATION LIKE '%${param.currentOperation}%')
+                </if>
 <!--                <if test="param.itemDescription != null and param.itemDescription != ''">-->
 <!--                    AND IT.DESCRIPTION LIKE '%${param.itemDescription}%'-->
 <!--                </if>-->