回退

src/main/java/com/yunzhi/marketing/base/BaseController.java

@@ -167,19 +167,14 @@ public class BaseController {
         if (taUser == null) {
             return null;
         }
-
-        List<TaPersonBuilding> taPersonBuildingList = new ArrayList<>();
-
-        // 新的过滤条件组织机构
-//        List<TaBuilding> list = taBuildingService.selectByUserId(taUser.getUserId());
-//        for (TaBuilding taBuilding: list) {
-//            TaPersonBuilding taPersonBuilding = new TaPersonBuilding();
-//            taPersonBuilding.setBuildingId(taBuilding.getBuildingId());
-//            taPersonBuilding.setUserId(taUser.getUserId());
-//            taPersonBuildingList.add(taPersonBuilding);
-//        }
-
+        QueryWrapper<TaPersonBuilding> taPersonBuildingQueryWrapper = new QueryWrapper<>();
+        taPersonBuildingQueryWrapper.eq("user_id", taUser.getUserId());
+        List<TaPersonBuilding> taPersonBuildingList = taPersonBuildingService.list(taPersonBuildingQueryWrapper);
+        if (null != taUser.getIsAdmin() && taUser.getIsAdmin()) {
+            taPersonBuildingList = new ArrayList<>();
+        }
         return taPersonBuildingList;
     }
+    
 }