diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ResourcesService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ResourcesService.java index 168c7ae8fdd4709bbc238efc43a66139fad5a2f3..7eb99c3ea0e50db7b3d25024d15de0bb3f9f185f 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ResourcesService.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ResourcesService.java @@ -165,6 +165,14 @@ public class ResourcesService extends BaseService { return result; } + /** + * check resource is exists + * + * @param alias alias + * @param userId user id + * @param type type + * @return true if resource exists + */ private boolean checkResourceExists(String alias, int userId, int type ){ List resources = resourcesMapper.queryResourceList(alias, userId, type); diff --git a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml index 146daa0632b52e654ec84a05a34f45abb6aeddf0..2146d1ac202f5235dd0a4203055c8b5a023f4220 100644 --- a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml +++ b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml @@ -39,8 +39,10 @@ and type=#{type} - and id in (select resources_id from t_ds_relation_resources_user where user_id=#{userId} - union select id as resources_id from t_ds_resources where user_id=#{userId}) + + and id in (select resources_id from t_ds_relation_resources_user where user_id=#{userId} + union select id as resources_id from t_ds_resources where user_id=#{userId}) +