From dcbe71cffd80eb08189a36c028e98c7b83d4e5ad Mon Sep 17 00:00:00 2001
From: Kris <2893855659@qq.com>
Date: Wed, 30 Jul 2025 11:04:48 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90fix=E3=80=91=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=85=B3=E8=81=94=E7=B1=BB=E5=9E=8B=E5=92=8C?=
 =?UTF-8?q?=E5=AD=98=E9=87=8F=E6=96=87=E4=BB=B6=E5=AF=B9=E8=B1=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit f7572ad7ac4e5a6e302236b1d283dc70b89a0a8a)
---
 .../service/impl/CommonServiceImpl.java       | 36 ++++++++++---------
 .../impl/DataImportNewServiceImpl.java        |  2 +-
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/celnet/datadump/service/impl/CommonServiceImpl.java b/src/main/java/com/celnet/datadump/service/impl/CommonServiceImpl.java
index 60d529f..da72e8c 100644
--- a/src/main/java/com/celnet/datadump/service/impl/CommonServiceImpl.java
+++ b/src/main/java/com/celnet/datadump/service/impl/CommonServiceImpl.java
@@ -853,6 +853,26 @@ public class CommonServiceImpl implements CommonService {
                 List<Map<String, Object>> maps = Lists.newArrayList();
                 for (String key : keys) {
                     if (fields.stream().anyMatch(key::equalsIgnoreCase)) {
+                        // ContentVersion表，插入更新时把title中的/替换为-
+                        if ("ContentVersion".equals(one.getName()) && "Title".equals(key)){
+                            String title = StringUtils.replace(String.valueOf(jsonObject.get("Title")), "/", "-");
+                            Map<String, Object> paramMap = Maps.newHashMap();
+                            paramMap.put("key", "Title");
+                            paramMap.put("value", title);
+                            maps.add(paramMap);
+                            continue;
+                        }
+
+                        // Attachment，插入更新时把Name中的/替换为-
+                        if ("Attachment".equals(one.getName()) && "Name".equals(key)){
+                            String name = StringUtils.replace(String.valueOf(jsonObject.get("Name")), "/", "-");
+                            Map<String, Object> paramMap = Maps.newHashMap();
+                            paramMap.put("key", "Name");
+                            paramMap.put("value", name);
+                            maps.add(paramMap);
+                            continue;
+                        }
+
                         Map<String, Object> paramMap = Maps.newHashMap();
                         paramMap.put("key", key);
                         paramMap.put("value", jsonObject.get(key));
@@ -872,23 +892,7 @@ public class CommonServiceImpl implements CommonService {
                     maps.add(paramMap2);
                 }
 
-                // ContentVersion表，插入更新时把title中的/替换为-
-                if ("ContentVersion".equals(one.getName())){
-                    String title = StringUtils.replace(String.valueOf(jsonObject.get("Title")), "/", "-");
-                    Map<String, Object> paramMap = Maps.newHashMap();
-                    paramMap.put("key", "Title");
-                    paramMap.put("value", title);
-                    maps.add(paramMap);
-                }
 
-                // Attachment，插入更新时把Name中的/替换为-
-                if ("Attachment".equals(one.getName())){
-                    String name = StringUtils.replace(String.valueOf(jsonObject.get("Name")), "/", "-");
-                    Map<String, Object> paramMap = Maps.newHashMap();
-                    paramMap.put("key", "Name");
-                    paramMap.put("value", name);
-                    maps.add(paramMap);
-                }
 
                 if (existsIds.contains(id)) {
                     customMapper.updateById(api, maps, id);
diff --git a/src/main/java/com/celnet/datadump/service/impl/DataImportNewServiceImpl.java b/src/main/java/com/celnet/datadump/service/impl/DataImportNewServiceImpl.java
index da14bb2..89f399e 100644
--- a/src/main/java/com/celnet/datadump/service/impl/DataImportNewServiceImpl.java
+++ b/src/main/java/com/celnet/datadump/service/impl/DataImportNewServiceImpl.java
@@ -1863,7 +1863,7 @@ public class DataImportNewServiceImpl implements DataImportNewService {
         String sql1 = null;
         String sql2 = null;
         if (beginDateStr != null){
-            sql1 = "where SystemModstamp >= '" + beginDateStr;
+            sql1 = "where SystemModstamp >= " + beginDateStr;
             sql2 = "SystemModstamp >= "+ beginDateStr +" order by Id limit " ;
         }else {
             sql1 = null;