调整种植管理

apps/Equipment/views.py

@@ -2272,7 +2272,10 @@ class Garden_User_View(ListView):
             garden = GardenArea.objects.filter(user=current_user)
         if gardenname:
             garden = GardenArea.objects.filter(name=gardenname)
-        farm = FarmList.objects.filter(garden=garden[0])
+        if garden:
+            farm = FarmList.objects.filter(garden=garden[0])
+        else:
+            farm = ""
         if current_user.is_staff == True:
             garden = GardenArea.objects.all()
         elif current_user.is_staff != True:
@@ -2677,7 +2680,10 @@ class CropCount(ListView):
             garden = GardenArea.objects.filter(user=current_user)
         if gardenname:
             garden = GardenArea.objects.filter(name=gardenname)
-        farm = FarmList.objects.filter(garden=garden[0])
+        if garden:
+            farm = FarmList.objects.filter(garden=garden[0])
+        else:
+            farm = ""
         if current_user.is_staff == True:
             garden = GardenArea.objects.all()
         elif current_user.is_staff != True:

apps/Home/views.py

@@ -86,8 +86,6 @@ appkey 和 AppSecret
 app_key = "u8dF3opl0xCq1a"
 app_secret = "Qz4jLdSisLDzyDxCdog7"
 urls = "http://10.10.0.227:17022/ducore/oauth/oauthLogin/oauthLogin/" 
-# url = "http://47.104.218.216:80/tests"
-# url = ""
 headers = {"app_key":app_key,"app_secret":app_secret}
 #登陆校验
 class Log_Verify(View):
@@ -177,7 +175,7 @@ class Log_Verify(View):
                                                                "two_news": two_news, "video_news": video_news,"hotel":hotel,"garden":garden,"hotel2":hotel2,
                                                                "product": product, "pick": pick, "farm": farm, "curr_user": curr_user,"sightsee":sightsee})
         else:
-            return HttpResponse("1")
+            return render(request,"outerNet/error.html",context={})
 
 
 class Home_Test(View):