修复 bug

src/main/java/com/huiju/estateagents/service/impl/TaPersonServiceImpl.java

@@ -18,6 +18,7 @@ import com.huiju.estateagents.event.EventBus;
 import com.huiju.estateagents.mapper.*;
 import com.huiju.estateagents.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Service;
@@ -28,6 +29,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -432,15 +434,21 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         personBuildingQueryWrapper.eq("building_id",buildingId);
         List<TaPersonBuilding> list = taPersonBuildingMapper.selectList(personBuildingQueryWrapper);
         List<Integer>idLists = new ArrayList<>();
-        for(int i=0; i<list.size();i++){
-            if(null != list.get(i).getUserId()){
-                idLists.add(list.get(i).getUserId());
-            }
+//        for(int i=0; i<list.size();i++){
+//            if(null != list.get(i).getUserId()){
+//                idLists.add(list.get(i).getUserId());
+//            }
+//        }
+
+        idLists = list.stream().filter(e -> null != e.getUserId()).map(e -> e.getUserId()).collect(Collectors.toList());
+        IPage<TaUser> data = new Page<>();
+        if(CollectionUtils.isNotEmpty(idLists)) {
+            QueryWrapper<TaUser> userQueryWrapper = new QueryWrapper<>();
+            userQueryWrapper.in("user_id",idLists);
+            userQueryWrapper.eq("is_consultant", true);
+            data = taUserService.page(page,userQueryWrapper);
         }
-        QueryWrapper<TaUser> userQueryWrapper = new QueryWrapper<>();
-        userQueryWrapper.in("user_id",idLists);
-        userQueryWrapper.eq("is_consultant", true);
-        IPage<TaUser> data = taUserService.page(page,userQueryWrapper);
+
         return data;
     }