Merge branch 'bin' of ssh://192.168.136.99:10022/SERVER/AnsjerServer into bin

Controller/CDKController.py

@@ -115,7 +115,7 @@ class CDKView(View):
         cdk = request_dict.get('cdk', None)
         order = request_dict.get('order', None)
         is_activate = request_dict.get('is_activate', None)
-        lang = request_dict.get('lang', None)
+        lang = request_dict.get('lang', 'cn')
         searchVal = ''
         if cdk:
             searchVal = cdk.strip()
@@ -134,8 +134,6 @@ class CDKView(View):
                 elif is_activate:
                     cdk_qs = cdk_qs.filter(is_activate=searchVal)
 
-            if not lang:
-                lang = 'cn'
 
             cdk_qs = cdk_qs.filter(rank__lang__lang=lang)
             cdk_qs = cdk_qs.annotate(rank__title=F('rank__lang__title'))
@@ -161,7 +159,7 @@ class CDKView(View):
 
     def deleteCDK(self, request_dict, response):
         cdk_id = request_dict.get("id", None)
-        lang = request_dict.get("lang", None)
+        lang = request_dict.get("lang", 'cn')
         try:
             CDKcontextModel.objects.get(cdk=cdk_id).delete()
         except Exception as e:
@@ -192,8 +190,6 @@ class CDKView(View):
                     elif is_activate:
                         cdk_qs = cdk_qs.filter(is_activate=searchVal)
 
-                if not lang:
-                    lang = 'cn'
 
                 cdk_qs = cdk_qs.filter(rank__lang__lang=lang)
                 cdk_qs = cdk_qs.annotate(rank__title=F('rank__lang__title'))

Controller/MealManage.py

@@ -133,11 +133,9 @@ class MealManage(View):
 
         page = int(request_dict.get('page', None))
         line = int(request_dict.get('line', None))
-        lang = request_dict.get('lang', None)
+        lang = request_dict.get('lang', 'cn')
         if page is None or line is None:
             return response.json(444)
-        if not lang:
-            lang = 'cn'
 
         qs = Store_Meal.objects.filter(lang__lang=lang)
         qs = qs.annotate(title=F('lang__title'),content=F('lang__content'))