From efe11bf6efdaa0dcab7eb469a864c1bd6adcb333 Mon Sep 17 00:00:00 2001
From: xjm <xjm@cloudowr.com>
Date: Fri, 24 May 2024 17:22:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B0=94=E8=B1=A1=E9=A2=84=E8=AD=A6=E5=8E=86?=
 =?UTF-8?q?=E5=8F=B2=E6=B0=94=E8=B1=A1=E9=A2=84=E8=AD=A6=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/AddressBookServiceImpl.java  | 27 +++++++------------
 1 file changed, 10 insertions(+), 17 deletions(-)

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;
 
 /**
  * <p>
  * 服务实现类
  * </p>
+ *
  * @author xusan
  * @date 2024-05-11
  */
@@ -32,24 +31,18 @@ public class AddressBookServiceImpl extends ServiceImpl<AddressBookMapper, Addre
     public IPage<AddressBookVo> 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<AddressBookMapper, Addre
         return baseMapper.find(dto);
     }
 
-    @Cacheable(value=ADDRESS_BOOK_REDIS_KEY,key = "#root.method.name+':'+#adnm")
+    @Cacheable(value = ADDRESS_BOOK_REDIS_KEY, key = "#root.method.name+':'+#adnm")
     @Override
     public List<AddressBook> getListByAdnm(String adnm) {
         return baseMapper.getListByAdnm(adnm);