From caa7a03a88f057936a52b8de4cd6c0491829d7f2 Mon Sep 17 00:00:00 2001
From: ZZM <1105966949@qq.com>
Date: Fri, 26 Dec 2025 16:26:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=95=86=E7=99=BB=E8=AE=B0=E5=BC=80?=
 =?UTF-8?q?=E4=B8=9A=E5=85=AC=E6=B5=B7=EF=BC=9A=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/security/util/EsDataEncryptUtil.java        |  4 +++-
 .../java/com/kakarote/crm/common/ElasticUtil.java    |  2 +-
 .../com/kakarote/crm/service/CrmPageService.java     |  8 +++++++-
 .../crm/service/impl/CrmCustomerServiceImpl.java     | 12 ++++++++++--
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/core/src/main/java/com/kakarote/core/security/util/EsDataEncryptUtil.java b/core/src/main/java/com/kakarote/core/security/util/EsDataEncryptUtil.java
index 3741e08..32bf3cd 100644
--- a/core/src/main/java/com/kakarote/core/security/util/EsDataEncryptUtil.java
+++ b/core/src/main/java/com/kakarote/core/security/util/EsDataEncryptUtil.java
@@ -46,7 +46,9 @@ public class EsDataEncryptUtil {
                 "status",
                 "planNum",
                 "checkStatus",
-                "_id"
+                "_id",
+                "website",
+                "remark"
         ));
 
         // 检查传入的字段是否不在上述集合中
diff --git a/crm/src/main/java/com/kakarote/crm/common/ElasticUtil.java b/crm/src/main/java/com/kakarote/crm/common/ElasticUtil.java
index a07bd66..9e31d4c 100644
--- a/crm/src/main/java/com/kakarote/crm/common/ElasticUtil.java
+++ b/crm/src/main/java/com/kakarote/crm/common/ElasticUtil.java
@@ -302,7 +302,7 @@ public class ElasticUtil {
      * @param queryBuilder 查询器
      */
     public static void textSearch(CrmSearchBO.Search search, BoolQueryBuilder queryBuilder) {
-        if (search.getValues().size() == 0 && !Arrays.asList(5, 6).contains(search.getSearchEnum().getType())) {
+        if (search.getValues().isEmpty() && !Arrays.asList(5, 6).contains(search.getSearchEnum().getType())) {
             return;
         }
 
diff --git a/crm/src/main/java/com/kakarote/crm/service/CrmPageService.java b/crm/src/main/java/com/kakarote/crm/service/CrmPageService.java
index 43234b3..f7a3cf2 100644
--- a/crm/src/main/java/com/kakarote/crm/service/CrmPageService.java
+++ b/crm/src/main/java/com/kakarote/crm/service/CrmPageService.java
@@ -239,6 +239,9 @@ public interface CrmPageService {
         //排序以及查询字段
         sort(crmSearchBO, sourceBuilder);
         sourceBuilder.query(createQueryBuilder(crmSearchBO));
+        // 查询语句
+        String queryString  = sourceBuilder.toString();
+        log.info("Elasticsearch 查询语句: {}", queryString);
         return sourceBuilder;
     }
 
@@ -391,7 +394,10 @@ public interface CrmPageService {
         FieldEnum fieldEnum = FieldEnum.parse(formType);
         switch (fieldEnum) {
             case TEXTAREA:
-                search.setName(search.getName() + ".keyword");
+                // 如果是 remark 字段，不添加 .keyword
+                if (!"remark".equals(search.getName())) {
+                    search.setName(search.getName() + ".keyword");
+                }
             case TEXT:
             case MOBILE:
             case EMAIL:
diff --git a/crm/src/main/java/com/kakarote/crm/service/impl/CrmCustomerServiceImpl.java b/crm/src/main/java/com/kakarote/crm/service/impl/CrmCustomerServiceImpl.java
index a6a5ecd..5449f3c 100644
--- a/crm/src/main/java/com/kakarote/crm/service/impl/CrmCustomerServiceImpl.java
+++ b/crm/src/main/java/com/kakarote/crm/service/impl/CrmCustomerServiceImpl.java
@@ -397,6 +397,14 @@ public class CrmCustomerServiceImpl extends BaseServiceImpl<CrmCustomerMapper, C
         } else {
             crmModel = new CrmModel(CrmEnum.CUSTOMER.getType());
         }
+
+        // 对行政区划进行处理
+        if (crmModel.get("remark") != null) {
+            String xzqhDm = crmModel.get("remark").toString();
+            String xzqhName = xzqhService.getXzqhName(xzqhDm);
+            crmModel.replace("remark", xzqhName);
+        }
+
         // 数据脱敏
         return encryptSensitiveData(crmModel);
     }
@@ -659,8 +667,8 @@ public class CrmCustomerServiceImpl extends BaseServiceImpl<CrmCustomerMapper, C
             }else if ("客户详细地址".equals(crmField.getName())){
                 field.setValue(gsdjxx.getScjydz());
             }else if ("客户所在地区".equals(crmField.getName())){
-                String xzqhName = xzqhService.getXzqhName(gsdjxx.getScjydzxzqhszDm());
-                field.setValue(xzqhName);
+                //String xzqhName = xzqhService.getXzqhName(gsdjxx.getScjydzxzqhszDm());
+                field.setValue(gsdjxx.getXzqhDm());
             }else if ("开业日期".equals(crmField.getName())){
                 field.setValue(gsdjxx.getKyrq());
             }else if ("客户名称".equals(crmField.getName())){