From 025b5e90388e106649a3419b162ad1d077567cf5 Mon Sep 17 00:00:00 2001
From: Trae AI <trae@example.com>
Date: Wed, 4 Feb 2026 15:47:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=AC=E6=B5=B7=E6=B1=A0?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=8C=89=E9=92=AE=E5=92=8C=E5=BD=92=E8=BF=98?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/service/impl/UserServiceImpl.java     | 19 +++++++++++++------
 web/src/main/resources/static/index.html      |  2 +-
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/web/src/main/java/com/example/web/service/impl/UserServiceImpl.java b/web/src/main/java/com/example/web/service/impl/UserServiceImpl.java
index 7c8f210..5c8eeea 100644
--- a/web/src/main/java/com/example/web/service/impl/UserServiceImpl.java
+++ b/web/src/main/java/com/example/web/service/impl/UserServiceImpl.java
@@ -305,12 +305,19 @@ public class UserServiceImpl implements UserService {
             }
             
             // 获取客户信息
-            Users user = usersMapper.findByUserId(userId);
-            if (user == null) {
-                result.put("success", false);
-                result.put("message", "客户不存在");
-                return result;
-            }
+        Users user = usersMapper.findByUserId(userId);
+        if (user == null) {
+            result.put("success", false);
+            result.put("message", "客户不存在");
+            return result;
+        }
+        
+        // 检查客户是否已经被跟进过
+        if (user.getFollowup_at() == null) {
+            result.put("success", false);
+            result.put("message", "客户未跟进，不允许归还到公海池");
+            return result;
+        }
             
             // 根据用户选择的类型进行不同的归还处理
             // type参数是用户选择的类型，可能值包括：buyer(大贸易客户)、seller(供应商)、both(两者都是)、smalls(小品种客户)
diff --git a/web/src/main/resources/static/index.html b/web/src/main/resources/static/index.html
index b6ae2f1..257a72e 100644
--- a/web/src/main/resources/static/index.html
+++ b/web/src/main/resources/static/index.html
@@ -3146,7 +3146,7 @@
                         '<td>' + (user.followup || '-') + '</td>' +
                         '<td>' + responseTime + '</td>' +
                         managerCell +
-                        '<td><button onclick="openFollowupModal(\'' + (user.userId || '') + '\', \'' + (user.nickName || '') + '\', \'' + (user.phoneNumber || '') + '\'); event.stopPropagation();" style="padding: 4px 8px; background-color: #1890ff; color: white; border: none; border-radius: 4px; font-size: 12px; margin-right: 4px;">跟进</button> <button onclick="openDetailModal(\'' + (user.userId || '') + '\'); event.stopPropagation();" style="padding: 4px 8px; background-color: #13c2c2; color: white; border: none; border-radius: 4px; font-size: 12px; margin-right: 4px;">详情</button> <button onclick="openReturnModal(\'' + (user.userId || '') + '\', \'' + (user.nickName || '') + '\', \'' + (user.phoneNumber || '') + '\', \'' + (user.type || '') + '\'); event.stopPropagation();" style="padding: 4px 8px; background-color: #faad14; color: white; border: none; border-radius: 4px; font-size: 12px; margin-right: 4px;">归还</button></td>' +
+                        '<td><button onclick="openDetailModal(\'' + (user.userId || '') + '\'); event.stopPropagation();" style="padding: 4px 8px; background-color: #13c2c2; color: white; border: none; border-radius: 4px; font-size: 12px; margin-right: 4px;">详情</button> <button onclick="claimCustomer(\'' + (user.userId || '') + '\', \'' + (user.nickName || '') + '\', \'' + (user.phoneNumber || '') + '\'); event.stopPropagation();" style="padding: 4px 8px; background-color: #52c41a; color: white; border: none; border-radius: 4px; font-size: 12px;">认领</button></td>' +
                         '</tr>';
                     publicBody.innerHTML += row;