diff --git a/apps/history/serializers.py b/apps/history/serializers.py index a34f69d..77dbfe2 100644 --- a/apps/history/serializers.py +++ b/apps/history/serializers.py @@ -116,6 +116,7 @@ class DepartmentSerializer(serializers.ModelSerializer): obj = Department.objects.filter(id=data) if not obj: raise serializers.ValidationError("查询的部门不存在") + return data # class MembersSerializer(serializers.HyperlinkedModelSerializer): diff --git a/apps/history/views.py b/apps/history/views.py index 5a8a671..88baf1c 100644 --- a/apps/history/views.py +++ b/apps/history/views.py @@ -40,27 +40,35 @@ conf.read(os.path.join(BASE_DIR, "config.ini"), encoding="utf-8") class DepartmentMessageView(GenericAPIView): """获取部门信息""" + serializer_class = DepartmentSerializer + def get(self, request): queryset = Department.objects.all() if request.query_params: try: + # serializer = DepartmentSerializer(instance=queryset.get(id=request.query_params['id'])) serializer = DepartmentSerializer(instance=queryset.get(id=request.query_params['id'])) - department_data = dict(serializer.data) - department_data["background"] = conf.get("Django", "Host") + department_data["background"] - department_data["icon"] = conf.get("Django", "Host") + department_data["icon"] - return Response({"code": 20000, "msg": get_msg("20000"), "data": department_data}) + + # department_data = dict(serializer.data) + # department_data["background"] = conf.get("Django", "Host") + department_data["background"] + # department_data["icon"] = conf.get("Django", "Host") + department_data["icon"] + # return Response({"code": 20000, "msg": get_msg("20000"), "data": department_data}) + return Response({"code": 20000, "msg": get_msg("20000"), "data": serializer.data}) + except Department.DoesNotExist: return Response({"code": 40000, "msg": "查询部门不存在"}) # except TypeError: # return Response({"code": 40000, "msg": "查询部门不存在"}) else: serializer = DepartmentSerializer(instance=queryset, many=True) - department_data = dict(serializer.data) - department_data["background"] = conf.get("Django", "Host") + department_data["background"] - department_data["icon"] = conf.get("Django", "Host") + department_data["icon"] - return Response({"code": 20000, "msg": get_msg("20000"), "data": department_data}) + # department_data = dict(serializer.data) + # department_data["background"] = conf.get("Django", "Host") + department_data["background"] + # department_data["icon"] = conf.get("Django", "Host") + department_data["icon"] + # return Response({"code": 20000, "msg": get_msg("20000"), "data": department_data}) + return Response({"code": 20000, "msg": get_msg("20000"), "data": serializer.data}) + # print(request.query_params) @@ -138,7 +146,7 @@ class HistoryViewSet(APIView): response["code"] = 40000 response["msg"] = "查询部门不存在" return Response(data=response) - for i in range(ser.first().years, ser.last().years + 1): + for i in range(ser.last().years, ser.first().years - 1, -1): msg["years"] = i msg["data"] = HistorySerializer(instance=ser.filter(years=i), many=True).data data.append(msg.copy()) diff --git a/apps/work/views.py b/apps/work/views.py index ef64d79..f9d3f3e 100644 --- a/apps/work/views.py +++ b/apps/work/views.py @@ -36,7 +36,8 @@ class Work(GenericAPIView): temp['grade'] = i temp['data'] = serializer.data for i in temp['data']: - i["img"] = get_path() + i["img"] + if i.get("img"): + i["img"] = get_path() + i["img"] data['data'].append(temp) # except Exception: # """如果没有查到数据"""