魏熙美 5 年 前
コミット
a41c0767a7
共有1 個のファイルを変更した16 個の追加8 個の削除を含む
  1. 16
    8
      src/main/java/com/huiju/estateagents/service/impl/TaPersonServiceImpl.java

+ 16
- 8
src/main/java/com/huiju/estateagents/service/impl/TaPersonServiceImpl.java ファイルの表示

18
 import com.huiju.estateagents.mapper.*;
18
 import com.huiju.estateagents.mapper.*;
19
 import com.huiju.estateagents.service.*;
19
 import com.huiju.estateagents.service.*;
20
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
20
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
21
+import org.apache.commons.collections.CollectionUtils;
21
 import org.springframework.beans.factory.annotation.Autowired;
22
 import org.springframework.beans.factory.annotation.Autowired;
22
 import org.springframework.context.ApplicationContext;
23
 import org.springframework.context.ApplicationContext;
23
 import org.springframework.stereotype.Service;
24
 import org.springframework.stereotype.Service;
28
 import java.util.HashMap;
29
 import java.util.HashMap;
29
 import java.util.List;
30
 import java.util.List;
30
 import java.util.Map;
31
 import java.util.Map;
32
+import java.util.stream.Collectors;
31
 
33
 
32
 /**
34
 /**
33
  * <p>
35
  * <p>
432
         personBuildingQueryWrapper.eq("building_id",buildingId);
434
         personBuildingQueryWrapper.eq("building_id",buildingId);
433
         List<TaPersonBuilding> list = taPersonBuildingMapper.selectList(personBuildingQueryWrapper);
435
         List<TaPersonBuilding> list = taPersonBuildingMapper.selectList(personBuildingQueryWrapper);
434
         List<Integer>idLists = new ArrayList<>();
436
         List<Integer>idLists = new ArrayList<>();
435
-        for(int i=0; i<list.size();i++){
436
-            if(null != list.get(i).getUserId()){
437
-                idLists.add(list.get(i).getUserId());
438
-            }
437
+//        for(int i=0; i<list.size();i++){
438
+//            if(null != list.get(i).getUserId()){
439
+//                idLists.add(list.get(i).getUserId());
440
+//            }
441
+//        }
442
+
443
+        idLists = list.stream().filter(e -> null != e.getUserId()).map(e -> e.getUserId()).collect(Collectors.toList());
444
+        IPage<TaUser> data = new Page<>();
445
+        if(CollectionUtils.isNotEmpty(idLists)) {
446
+            QueryWrapper<TaUser> userQueryWrapper = new QueryWrapper<>();
447
+            userQueryWrapper.in("user_id",idLists);
448
+            userQueryWrapper.eq("is_consultant", true);
449
+            data = taUserService.page(page,userQueryWrapper);
439
         }
450
         }
440
-        QueryWrapper<TaUser> userQueryWrapper = new QueryWrapper<>();
441
-        userQueryWrapper.in("user_id",idLists);
442
-        userQueryWrapper.eq("is_consultant", true);
443
-        IPage<TaUser> data = taUserService.page(page,userQueryWrapper);
451
+
444
         return data;
452
         return data;
445
     }
453
     }
446
 
454