fix: 修复分页查询时间相同的情况下数据错乱

Author: shaohuzhang1

apps/dataset/serializers/dataset_serializers.py

@@ -139,14 +139,14 @@ def get_query_set(self):
             query_set = QuerySet(model=get_dynamics_model(
                 {'temp.name': models.CharField(), 'temp.desc': models.CharField(),
                  "document_temp.char_length": models.IntegerField(), 'temp.create_time': models.DateTimeField(),
-                 'temp.user_id': models.CharField(), }))
+                 'temp.user_id': models.CharField(), 'temp.id': models.CharField()}))
             if "desc" in self.data and self.data.get('desc') is not None:
                 query_set = query_set.filter(**{'temp.desc__icontains': self.data.get("desc")})
             if "name" in self.data and self.data.get('name') is not None:
                 query_set = query_set.filter(**{'temp.name__icontains': self.data.get("name")})
             if "select_user_id" in self.data and self.data.get('select_user_id') is not None:
                 query_set = query_set.filter(**{'temp.user_id__exact': self.data.get("select_user_id")})
-            query_set = query_set.order_by("-temp.create_time")
+            query_set = query_set.order_by("-temp.create_time", "temp.id")
             query_set_dict['default_sql'] = query_set
 
             query_set_dict['dataset_custom_sql'] = QuerySet(model=get_dynamics_model(

apps/dataset/serializers/document_serializers.py

@@ -374,7 +374,7 @@ def get_query_set(self):
                 query_set = query_set.filter(**{'is_active': self.data.get('is_active')})
             if 'status' in self.data and self.data.get('status') is not None:
                 query_set = query_set.filter(**{'status': self.data.get('status')})
-            query_set = query_set.order_by('-create_time')
+            query_set = query_set.order_by('-create_time', 'id')
             return query_set
 
         def list(self, with_valid=False):