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}
- AND T.CALL_STATUS = #{dto.callStatus}
+
+ AND T.CALL_STATUS = #{dto.callStatus}
+
+
+ AND T.CALL_STATUS != 1
+
AND T.PHONE LIKE CONCAT('%', #{dto.phone}, '%')