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 @@ '' + (user.followup || '-') + '' + '' + responseTime + '' + managerCell + - ' ' + + ' ' + ''; publicBody.innerHTML += row;