Your Name 5 vuotta sitten
vanhempi
commit
5fe8432f65
1 muutettua tiedostoa jossa 15 lisäystä ja 9 poistoa
  1. 15 9
      apps/Equipment/views.py

+ 15 - 9
apps/Equipment/views.py

@@ -1990,8 +1990,13 @@ class Park_Land(ListView):
         username = request.user.username
         print('username:',username)
         current_user = MyUser.objects.get(username=username)
-        art_list = GardenArea.objects.filter(user=current_user)
-        data=[]
+        data = []
+        if current_user.is_superuser != True and current_user.is_staff != True:
+            #用户
+            art_list = GardenArea.objects.filter(user=current_user)
+        else:
+            #管理员
+            art_list = GardenArea.objects.all()
         for i in art_list:
             data.append({"name":i.name,"id":i.id})
         data = json.dumps(data)
@@ -2377,13 +2382,11 @@ class Sell_View(ListView):
         username = request.user.username
         print('username:',username)
         current_user = MyUser.objects.get(username=username)
-        try:
-            # user_gar = GardenArea.objects.get(user=current_user)
+        if current_user.is_superuser != True and current_user.is_staff != True:
             farm_list = FarmList.objects.filter(garden__user=current_user)
-        except Exception as e:
-            print(e)
-            farm_list = ""
-        nums = farm_list.count()
+        else:
+            farm_list = FarmList.objects.all()
+        nums = len(farm_list)
         return render(request, 'backstageNet/production/sellManage.html', context={"farm_list":farm_list,"nums":nums})
     def post(self,request):
         username = request.user.username
@@ -2394,7 +2397,10 @@ class Sell_View(ListView):
         try:
             # user_gar = GardenArea.objects.get(user=current_user)
             # farm_list = FarmList.objects.filter(garden=user_gar)
-            farm_list = FarmList.objects.filter(garden__user=current_user)
+            if current_user.is_superuser != True and current_user.is_staff != True:
+                farm_list = FarmList.objects.filter(garden__user=current_user)
+            else:
+                farm_list = FarmList.objects.all()
             for i in farm_list:
                 for x in Sell_Manage.objects.filter(farm=i):
                     dat.append({