傅行帆 пре 3 година
родитељ
комит
8d38f0a8fc
1 измењених фајлова са 7 додато и 12 уклоњено
  1. 7
    12
      src/main/java/com/yunzhi/marketing/base/BaseController.java

+ 7
- 12
src/main/java/com/yunzhi/marketing/base/BaseController.java Прегледај датотеку

167
         if (taUser == null) {
167
         if (taUser == null) {
168
             return null;
168
             return null;
169
         }
169
         }
170
-
171
-        List<TaPersonBuilding> taPersonBuildingList = new ArrayList<>();
172
-
173
-        // 新的过滤条件组织机构
174
-//        List<TaBuilding> list = taBuildingService.selectByUserId(taUser.getUserId());
175
-//        for (TaBuilding taBuilding: list) {
176
-//            TaPersonBuilding taPersonBuilding = new TaPersonBuilding();
177
-//            taPersonBuilding.setBuildingId(taBuilding.getBuildingId());
178
-//            taPersonBuilding.setUserId(taUser.getUserId());
179
-//            taPersonBuildingList.add(taPersonBuilding);
180
-//        }
181
-
170
+        QueryWrapper<TaPersonBuilding> taPersonBuildingQueryWrapper = new QueryWrapper<>();
171
+        taPersonBuildingQueryWrapper.eq("user_id", taUser.getUserId());
172
+        List<TaPersonBuilding> taPersonBuildingList = taPersonBuildingService.list(taPersonBuildingQueryWrapper);
173
+        if (null != taUser.getIsAdmin() && taUser.getIsAdmin()) {
174
+            taPersonBuildingList = new ArrayList<>();
175
+        }
182
         return taPersonBuildingList;
176
         return taPersonBuildingList;
183
     }
177
     }
178
+    
184
 }
179
 }
185
 
180