超级管理员也根据绑定景区返回

Service/AgentService.py

@@ -68,24 +68,24 @@ class AgentService():
     @staticmethod
     def get_spot_info(agent_info):
         spot_info = []
-        if agent_info.level == 2 or agent_info.level == 3 or agent_info.level == 4 or agent_info.level == 5:
-            infos = db.session.query(AgentAccount, AgentSpot, Spot).join(AgentSpot,
-                                                                         AgentAccount.id == AgentSpot.agent_no).join(
-                Spot, Spot.id == AgentSpot.spot_no).filter(AgentAccount.id == agent_info.id,
-                                                           AgentAccount.status == ACCOUNT_STATUS['on_use'],
-                                                           AgentSpot.status == ACCOUNT_STATUS['on_use']).all()
-            for info in infos:
-                cur_info = {}
-                cur_info['id'] = info.Spot.id
-                cur_info['spotname'] = info.Spot.spotname
-                cur_info['letter'] = SpotService.get_pinyin(info.Spot.spotname)
-                spot_info.append(cur_info)
-        else:
-            infos = Spot.query.with_entities(Spot.id, Spot.spotname).all()
-            for info in infos:
-                cur_info = {}
-                cur_info['id'] = info.id
-                cur_info['spotname'] = info.spotname
-                cur_info['letter'] = SpotService.get_pinyin(info.spotname)
-                spot_info.append(cur_info)
+        # if agent_info.level == 2 or agent_info.level == 3 or agent_info.level == 4 or agent_info.level == 5:
+        infos = db.session.query(AgentAccount, AgentSpot, Spot).join(AgentSpot,
+                                                                     AgentAccount.id == AgentSpot.agent_no).join(
+            Spot, Spot.id == AgentSpot.spot_no).filter(AgentAccount.id == agent_info.id,
+                                                       AgentAccount.status == ACCOUNT_STATUS['on_use'],
+                                                       AgentSpot.status == ACCOUNT_STATUS['on_use']).all()
+        for info in infos:
+            cur_info = {}
+            cur_info['id'] = info.Spot.id
+            cur_info['spotname'] = info.Spot.spotname
+            cur_info['letter'] = SpotService.get_pinyin(info.Spot.spotname)
+            spot_info.append(cur_info)
+        # else:
+        #     infos = Spot.query.with_entities(Spot.id, Spot.spotname).all()
+        #     for info in infos:
+        #         cur_info = {}
+        #         cur_info['id'] = info.id
+        #         cur_info['spotname'] = info.spotname
+        #         cur_info['letter'] = SpotService.get_pinyin(info.spotname)
+        #         spot_info.append(cur_info)
         return spot_info