diff --git a/filemgr/filemgr.py b/filemgr/filemgr.py index ad58f27..08472f5 100644 --- a/filemgr/filemgr.py +++ b/filemgr/filemgr.py @@ -173,8 +173,13 @@ class FileMgr: async def has_sub(self, sor, folderid): sql = """select unique a.* from folder a left join folder b on a.id = b.parentid +where a.id=${folderid}$ + and b.id is not null +union +select unique a.* from folder a left join file c on a.id=c.folderid -where id=${folderid}$""" +where a.id=${folderid}$ + and b.id is not null""" recs = await sor.sqlExe(sql, {'folderid':folderid}) if recs: return True