From 2428b39e799777a73aa79b0f49316c65a387ebf1 Mon Sep 17 00:00:00 2001
From: Wanghong <1417307168@qq.com>
Date: Wed, 28 Jul 2021 09:23:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=AA=E7=AC=A6=E5=90=88?=
 =?UTF-8?q?=E9=A1=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SarStandUnqualifiedServiceImpl.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java
index 1c73a0d7..e5c91ca3 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java
@@ -1,5 +1,6 @@
 package com.adc.da.slrs.sarStandUnqualified.service.impl;
 
+import com.adc.da.att.entity.AttFileEO;
 import com.adc.da.slrs.sarStandUnqualified.entity.SarStandUnqualified;
 import com.adc.da.slrs.sarStandUnqualified.dao.SarStandUnqualifiedDao;
 import com.adc.da.slrs.sarStandUnqualified.entity.SarStandUnqualifiedPage;
@@ -17,9 +18,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.stereotype.Service;
 import java.sql.Timestamp;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 /**
  * <p>
@@ -42,7 +41,7 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl<SarStandUnqualif
     @Override
     public IPage<SarStandUnqualified> getSarStandUnqualifiedPage(SarStandUnqualifiedPage sarStandUnqualifiedPage) {
         QueryWrapper<SarStandUnqualified> sarStandUnqualifiedQueryWrapper=new QueryWrapper<>();
-        if(sarStandUnqualifiedPage.getStandId()!=null){
+        if(sarStandUnqualifiedPage.getStandId()!=null || sarStandUnqualifiedPage.getStandName()!=null){
             sarStandUnqualifiedQueryWrapper
                     .like("stand_id",sarStandUnqualifiedPage.getStandId())
                     .like("stand_name",sarStandUnqualifiedPage.getStandId());
@@ -73,8 +72,9 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl<SarStandUnqualif
     @Override
     public IPage<SarStandUnqualified> getSarStandUnqualifiedHistoryPage(SarStandUnqualifiedPage sarStandUnqualifiedPage) {
         QueryWrapper<SarStandUnqualified> sarStandUnqualifiedQueryWrapper=new QueryWrapper<>();
-        if(sarStandUnqualifiedPage.getStandId()!=null){
-            sarStandUnqualifiedQueryWrapper.and(wrapper->wrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()).or().like("stand_name",sarStandUnqualifiedPage.getStandId()));
+        if(sarStandUnqualifiedPage.getStandId()!=null || sarStandUnqualifiedPage.getStandName()!=null){
+            sarStandUnqualifiedQueryWrapper.like("stand_id",sarStandUnqualifiedPage.getStandId())
+                    .like("stand_name",sarStandUnqualifiedPage.getStandId());
 //            sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()).or().like("stand_name","%"+sarStandUnqualifiedPage.getStandId()+"%");
         }