From 970f7563c0de6fb17804a5b51e9c094b6e3b0cfb Mon Sep 17 00:00:00 2001
From: ladeng07 <40017222+ladeng07@users.noreply.github.com>
Date: Fri, 20 May 2022 21:54:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=8B=A5=E5=B9=B2bug?=
 =?UTF-8?q?=EF=BC=8C=E4=BC=98=E5=8C=96=E8=8B=A5=E5=B9=B2=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/history/serializers.py |  1 +
 apps/history/views.py       | 26 +++++++++++++++++---------
 apps/work/views.py          |  3 ++-
 3 files changed, 20 insertions(+), 10 deletions(-)

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:
             #    """如果没有查到数据"""