diff --git a/IBKLinker-Minio/Controller/MinioController/MinioApiController.cs b/IBKLinker-Minio/Controller/MinioController/MinioApiController.cs index 84c6397..20f9e7d 100644 --- a/IBKLinker-Minio/Controller/MinioController/MinioApiController.cs +++ b/IBKLinker-Minio/Controller/MinioController/MinioApiController.cs @@ -821,7 +821,7 @@ namespace IBKLinker_Minio.Controller.MinioController foreach (var items in minioStoragePath) //先循环接收数据 { checkdatelist = db.Query("select t.* from MINIO_STORAGE_PATH t where 1=1 and t.FILE_NAME='" + items.FileName + "'").ToList();//查询上传的文件或新建的文件夹在当前文件夹下是否有重复存在 - if (checkdatelist.Count > 0) //如果有 + if (checkdatelist.Count > 0 && items.FileType !=0) //如果有 { RecordFileName += items.FileName + ",";//记录名称 } @@ -1768,7 +1768,7 @@ namespace IBKLinker_Minio.Controller.MinioController bool Asstion = true;//定义是否执行关联 //sql = string.Format("select g.title from ASSETENTRY g where entryid in (select entryid2 from ASSETLINK t where entryid1 = (select t.entryid from ASSETENTRY t ,(select p.fileid from DLSYNC p where p.name = '{0}' and (p.event='add' or p.event = 'update') )o where t.classpk = o.fileid))", item.FileName); sql = string.Format("select g.title,g.username,g.createdate from ASSETENTRY g where entryid in (select entryid2 from ASSETLINK t where entryid1 = (select t.entryid from ASSETENTRY t ,(select p.fileid from DLSYNC p where p.name = '{0}' and (p.event='add' or p.event = 'update') and p.version='{1}' and ROWNUM = 1 order by p.version desc)o where t.classpk = o.fileid)) ", item.FileName, item.Version); - dt = filedb.Query(sql); + dt = db.Query(sql); if (dt.Rows.Count > 0) { for (int i = 0; i < dt.Rows.Count; i++) @@ -1852,7 +1852,7 @@ namespace IBKLinker_Minio.Controller.MinioController //{ //sql = string.Format("select g.title from ASSETENTRY g where entryid in (select entryid2 from ASSETLINK t where entryid1 = (select t.entryid from ASSETENTRY t ,(select p.fileid from DLSYNC p where p.name = '{0}' and (p.event='add' or p.event = 'update') )o where t.classpk = o.fileid))", item.FileName); sql = string.Format("select * from DLSYNC where parentfolderid='{0}' and (event='update' or event='add') ", parentfolderid); - dt = filedb.Query(sql); + dt = db.Query(sql); string sel = string.Format("select * from minio_storage_path where pk='{0}'", master); ; dta = db.Query(sel); if (dt.Rows.Count > 0)