From 057decf867fad1ed32057e03415e79c7586e7500 Mon Sep 17 00:00:00 2001 From: shaohuzhang1 Date: Wed, 31 Jan 2024 17:01:56 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E3=80=90=E7=9F=A5=E8=AF=86=E5=BA=93?= =?UTF-8?q?=E3=80=91-=20=E7=9F=A5=E8=AF=86=E5=BA=93=E8=83=BD=E5=85=B3?= =?UTF-8?q?=E8=81=94=E9=9D=9E=E8=87=AA=E5=B7=B1=E7=9A=84=E5=BA=94=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/application/serializers/application_serializers.py | 2 +- apps/dataset/serializers/dataset_serializers.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/application/serializers/application_serializers.py b/apps/application/serializers/application_serializers.py index 7e5505ad1..73fa0f173 100644 --- a/apps/application/serializers/application_serializers.py +++ b/apps/application/serializers/application_serializers.py @@ -377,7 +377,7 @@ class ApplicationSerializer(serializers.Serializer): application = QuerySet(Application).get(id=self.data.get("application_id")) return select_list(get_file_content( os.path.join(PROJECT_DIR, "apps", "application", 'sql', 'list_application_dataset.sql')), - [self.data.get('user_id'), application.user_id, self.data.get('user_id')]) + [self.data.get('user_id') if self.data.get('user_id')==str(application.user_id) else None, application.user_id, self.data.get('user_id')]) class ApplicationKeySerializerModel(serializers.ModelSerializer): class Meta: diff --git a/apps/dataset/serializers/dataset_serializers.py b/apps/dataset/serializers/dataset_serializers.py index 55d709ae5..bbe1f67c4 100644 --- a/apps/dataset/serializers/dataset_serializers.py +++ b/apps/dataset/serializers/dataset_serializers.py @@ -585,7 +585,8 @@ class DataSetSerializers(serializers.ModelSerializer): dataset = QuerySet(DataSet).get(id=self.data.get("id")) return select_list(get_file_content( os.path.join(PROJECT_DIR, "apps", "dataset", 'sql', 'list_dataset_application.sql')), - [self.data.get('user_id'), dataset.user_id, self.data.get('user_id')]) + [self.data.get('user_id') if self.data.get('user_id') == str(dataset.user_id) else None, + dataset.user_id, self.data.get('user_id')]) def one(self, user_id, with_valid=True): if with_valid: