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: