Merge branch 'pzb' of ssh://192.168.136.45:10022/SERVER/AnsjerServer into pzb

Controller/FeedBack.py

@@ -151,7 +151,7 @@ class FeedBackView(View):
             return response.json(0)
 
     def do_query_by_admin(self, userID, request_dict, response):
-        own_perm = ModelService.check_perm(userID, 40)
+        own_perm = ModelService.check_perm(userID, 30)
         if own_perm:
             page = request_dict.get('page', None)
             line = request_dict.get('line', None)
@@ -169,17 +169,16 @@ class FeedBackView(View):
                 if filter_data:
                     fb_qs = fb_qs.filter(**filter_data)
                 count = fb_qs.count()
-                fb_qs = fb_qs[(page - 1) * line:page * line]. \
-                    values('id', 'status', 'content', 'addTime', 'updTime','userID__username')
+                fb_qs = fb_qs[(page - 1) * line:page * line].values('id', 'status', 'content', 'addTime', 'updTime','userID__username')
                 sid_list = []
-
+                print (fb_qs)
                 for fb in fb_qs:
                     sid_list.append(fb['id'])
-                sm_qs = StatResModel.objects.filter(feedbackmodel__id__in=sid_list). \
-                    values('id', 'name', 'feedbackmodel__id')
+                sm_qs = StatResModel.objects.filter(feedbackmodel__id__in=sid_list).values('id', 'name', 'feedbackmodel__id')
                 auth = oss2.Auth(OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET)
                 bucket = oss2.Bucket(auth, 'oss-cn-hongkong.aliyuncs.com', 'statres')
                 res = []
+                print ( sm_qs)
                 for fb in fb_qs:
                     fb['img_url'] = []
                     for sm in sm_qs:

Controller/SysMsg.py

@@ -101,7 +101,7 @@ class SysMsgView(View):
             return response.json(444, 'page,line')
 
     def do_query_by_admin(self, userID, request_dict, response):
-        own_perm = ModelService.check_perm(userID, 40)
+        own_perm = ModelService.check_perm(userID, 30)
         if own_perm:
             page = request_dict.get('page', None)
             line = request_dict.get('line', None)