Merge pull request '修复搜索框筛选逻辑错误，支持负责人和类型筛选' (#13) from ly into KH

Reviewed-on: http://8.137.125.67:4000/SwtTt29/web-follow/pulls/13

web/src/main/resources/static/index.html

@@ -905,11 +905,6 @@
                 role: usersManagements.role || ''
             };
             
-            // 添加负责人筛选参数
-            if (currentManagerFilter) {
-                params.managerName = currentManagerFilter;
-            }
-            
             var url = '/KH/api/users?' + objectToQueryString(params);
             
             var xhr = new XMLHttpRequest();
@@ -974,6 +969,7 @@
                 
                 // 按负责人筛选
                 if (currentManagerFilter) {
+                    console.log('筛选负责人:', currentManagerFilter, '用户负责人:', user.managerName);
                     if (user.managerName !== currentManagerFilter) {
                         return false;
                     }
@@ -1009,7 +1005,18 @@
                 
                 // 按类型筛选
                 if (currentTypeFilter) {
-                    if (user.type !== currentTypeFilter) {
+                    var userType = user.type || '';
+                    console.log('筛选类型:', currentTypeFilter, '用户类型:', userType);
+                    // 如果筛选值是英文，需要转换为中文进行比较
+                    var typeMap = {
+                        'wholesale': '批发贸易类',
+                        'e-commerce': '电商平台类',
+                        'delivery_retail': '配送零售类',
+                        'defective_egg': '次品蛋专项类',
+                        'other': '其他类型'
+                    };
+                    var filterValue = typeMap[currentTypeFilter] || currentTypeFilter;
+                    if (userType !== filterValue) {
                         return false;
                     }
                 }
@@ -1723,10 +1730,10 @@
             var userRole = userInfo.loginInfo.projectName;
             var usersManagements = userInfo.usersManagements;
             
-            // 构建查询参数
+            // 构建查询参数，获取所有数据
             var params = {
-                page: publicPage,
+                page: 1,
-                size: publicPageSize,
+                size: 1000, // 假设最多1000条数据
                 userRole: userRole,
                 userName: usersManagements.userName || '',
                 managercompany: usersManagements.managercompany || '',
@@ -1735,29 +1742,6 @@
                 role: usersManagements.role || ''
             };
             
-            // 添加负责人筛选参数
-            if (currentManagerFilter) {
-                params.managerName = currentManagerFilter;
-            }
-            
-            // 添加手机号搜索参数
-            if (currentPhoneSearch) {
-                params.phoneNumber = currentPhoneSearch;
-            }
-            
-            // 添加日期范围搜索参数
-            if (currentStartDate) {
-                params.startDate = currentStartDate;
-            }
-            if (currentEndDate) {
-                params.endDate = currentEndDate;
-            }
-            
-            // 添加类型筛选参数
-            if (currentTypeFilter) {
-                params.type = currentTypeFilter;
-            }
-            
             var url = '/KH/api/users/public?' + objectToQueryString(params);
             
             var xhr = new XMLHttpRequest();
@@ -2855,16 +2839,68 @@
             
             if (data.users && data.users.length > 0) {
                 publicEmpty.style.display = 'none';
-                var filteredUsers = data.users.filter(function(user) {
+                allPublicData = data.users;
+                var filteredUsers = allPublicData.filter(function(user) {
+                    // 过滤掉同事类型
                     if (user.type === 'Colleague') {
                         return false;
                     }
                     
                     // 按负责人筛选
                     if (currentManagerFilter) {
-                        return user.managerName === currentManagerFilter;
+                        console.log('公海池筛选负责人:', currentManagerFilter, '用户负责人:', user.managerName);
+                        if (user.managerName !== currentManagerFilter) {
+                            return false;
+                        }
                     }
                     
+                    // 按手机号搜索
+                    if (currentPhoneSearch) {
+                        if (!user.phoneNumber || !user.phoneNumber.includes(currentPhoneSearch)) {
+                            return false;
+                        }
+                    }
+                    
+                    // 按创建时间范围筛选
+                    if (currentStartDate || currentEndDate) {
+                        var userCreatedAt = new Date(user.created_at);
+                        
+                        if (currentStartDate) {
+                            var startDate = new Date(currentStartDate);
+                            if (userCreatedAt < startDate) {
+                                return false;
+                            }
+                        }
+                        
+                        if (currentEndDate) {
+                            var endDate = new Date(currentEndDate);
+                            // 设置结束日期为当天的23:59:59
+                            endDate.setHours(23, 59, 59, 999);
+                            if (userCreatedAt > endDate) {
+                                return false;
+                            }
+                        }
+                    }
+                    
+                    // 按类型筛选
+                    if (currentTypeFilter) {
+                        var userType = user.type || '';
+                        console.log('公海池筛选类型:', currentTypeFilter, '用户类型:', userType);
+                        // 如果筛选值是英文，需要转换为中文进行比较
+                        var typeMap = {
+                            'wholesale': '批发贸易类',
+                            'e-commerce': '电商平台类',
+                            'delivery_retail': '配送零售类',
+                            'defective_egg': '次品蛋专项类',
+                            'other': '其他类型'
+                        };
+                        var filterValue = typeMap[currentTypeFilter] || currentTypeFilter;
+                        if (userType !== filterValue) {
+                            return false;
+                        }
+                    }
+                    
+                    // 其他情况，不过滤
                     return true;
                 });