Merge remote-tracking branch 'origin/sit-three-categories' into sit-three-categories

alien-store/src/main/java/shop/alien/store/service/impl/StoreStaffConfigServiceImpl.java

@@ -1767,9 +1767,12 @@ public class StoreStaffConfigServiceImpl implements StoreStaffConfigService {
                 return new ArrayList<>();
             }
 
-            // 4. 过滤已删除的员工
+            // 4. 过滤已删除的员工，并根据title中的storeId过滤，只返回status为1（审核通过）的员工
             List<StoreStaffConfig> validStaffList = staffList.stream()
-                    .filter(staff -> staff != null && CommonConstant.DELETE_FLAG_UNDELETE.equals(staff.getDeleteFlag()))
+                    .filter(staff -> staff != null 
+                            && CommonConstant.DELETE_FLAG_UNDELETE.equals(staff.getDeleteFlag())
+                            && storeId.equals(staff.getStoreId())
+                            && "1".equals(staff.getStatus()))
                     .collect(Collectors.toList());
 
             if (validStaffList.isEmpty()) {