diff --git a/src/main/java/com/whdc/service/impl/AddressBookServiceImpl.java b/src/main/java/com/whdc/service/impl/AddressBookServiceImpl.java
index c5a9b5a..9edf0ef 100644
--- a/src/main/java/com/whdc/service/impl/AddressBookServiceImpl.java
+++ b/src/main/java/com/whdc/service/impl/AddressBookServiceImpl.java
@@ -12,15 +12,14 @@ import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Service;
import java.util.List;
-import java.util.Objects;
import static com.whdc.controller.AddressBookController.ADDRESS_BOOK_REDIS_KEY;
-import static com.whdc.utils.AdinfoUtils.likeAdcd;
/**
*
* 服务实现类
*
+ *
* @author xusan
* @date 2024-05-11
*/
@@ -32,24 +31,18 @@ public class AddressBookServiceImpl extends ServiceImpl page(AddressBootDto dto) {
String adcd = dto.getAdcd();
- Integer adlevel = dto.getAdlevel();
- if (StringUtils.isNotBlank(adcd) && Objects.nonNull(adlevel)) {
- dto.setV("LIKE ");
- dto.setAdcd(likeAdcd(adcd, adlevel) + "%");
-
- } else {
- if (StringUtils.isNotBlank(adcd)) {
- if (adcd.length() < 15){
- dto.setV("LIKE ");
- dto.setAdcd(adcd + "%");
- }else {
- dto.setV("= ");
- dto.setAdcd(adcd);
- }
+ if (StringUtils.isNotBlank(adcd)) {
+ if (adcd.length() < 15) {
+ dto.setV("LIKE ");
+ dto.setAdcd(adcd + "%");
+ } else {
+ dto.setV("= ");
+ dto.setAdcd(adcd.replace("000000",""));
}
}
+
return baseMapper.page(dto.getPage(), dto);
}
@@ -59,7 +52,7 @@ public class AddressBookServiceImpl extends ServiceImpl getListByAdnm(String adnm) {
return baseMapper.getListByAdnm(adnm);