接口调整

apps/Equipment/views.py

@@ -2006,16 +2006,10 @@ class Garden_Manage_New(ListView):
         username = request.user.username
         print('username:',username)
         current_user = MyUser.objects.get(username=username)
-        if current_user.username == "admin":
-            art_list = FarmList.objects.all()
-            nums = art_list.count()
-        else:
-            art_list = FarmList.objects.filter(garden=gardenid)
-            print("aaa")
-            print(art_list)
-            for i in art_list:
-                print(i.name)
-            nums = art_list.count()
+        garden = GardenArea.objects.get(id=gardenid)
+        art_list = FarmList.objects.filter(garden=garden)
+
+        nums = art_list.count()
         page = int(request.GET.get('page'))
         art = art_list[(9*(page-1)):(page*9)]
         return render(request, 'backstageNet/production/gardenNew.html', context={"art":art,"nums":nums})
@@ -2220,8 +2214,10 @@ class Garden_User_New(ListView):
         username = request.user.username
         print('username:',username)
         current_user = MyUser.objects.get(username=username)
-        art_list = FarmUser.objects.all()
-        nums = art_list.count()        
+        farmid = request.GET.get('id')
+        art_list = FarmUser.objects.get(id=farmid)
+        FarmUser.objects.all()
+        nums = art_list.count()
         page = int(request.GET.get('page'))
         art = art_list[(9*(page-1)):(page*9)]
         return render(request, 'backstageNet/production/workerNew.html', context={"art":art,"nums":nums})