From 78878c984cb8307bed28bfce0282b0218f5755c2 Mon Sep 17 00:00:00 2001
From: xjm <xjm@cloudowr.com>
Date: Wed, 7 Aug 2024 10:44:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=B1=E6=B4=AA=E8=B4=A3=E4=BB=BB=E4=BA=BA?=
 =?UTF-8?q?=E9=80=9A=E8=AE=AF=E5=BD=95=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?,=E5=AF=BC=E5=87=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/whdc/controller/ShAddressBookController.java   | 10 ++++++++++
 src/main/resources/mapper/ShAddressBookMapper.xml      |  7 ++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/whdc/controller/ShAddressBookController.java b/src/main/java/com/whdc/controller/ShAddressBookController.java
index 2e032f6..2ec47aa 100644
--- a/src/main/java/com/whdc/controller/ShAddressBookController.java
+++ b/src/main/java/com/whdc/controller/ShAddressBookController.java
@@ -243,6 +243,16 @@ public class ShAddressBookController {
             query.like(ShAddressBook::getPhone, phone);
         }
 
+        String callStatus = dto.getCallStatus();
+
+        if (StringUtils.isNotBlank(phone)) {
+            if ("1".equals(callStatus)){
+                query.eq(ShAddressBook::getCallStatus, callStatus);
+            }else{
+                query.ne(ShAddressBook::getCallStatus, 1);
+            }
+        }
+
         query
                 .eq(ShAddressBook::getDel, REC)
                 .orderByAsc(ShAddressBook::getSort);
diff --git a/src/main/resources/mapper/ShAddressBookMapper.xml b/src/main/resources/mapper/ShAddressBookMapper.xml
index 1884f4e..158b34d 100644
--- a/src/main/resources/mapper/ShAddressBookMapper.xml
+++ b/src/main/resources/mapper/ShAddressBookMapper.xml
@@ -98,7 +98,12 @@
             AND T.LAND = #{dto.land}
         </if>
         <if test="dto.callStatus != null and dto.callStatus != '' ">
-            AND T.CALL_STATUS = #{dto.callStatus}
+            <if test="dto.callStatus == 1 ">
+                AND T.CALL_STATUS = #{dto.callStatus}
+            </if>
+            <if test="dto.callStatus == 0 ">
+                AND T.CALL_STATUS != 1
+            </if>
         </if>
         <if test="dto.phone != null and dto.phone != '' ">
             AND T.PHONE LIKE CONCAT('%', #{dto.phone}, '%')