|
@@ -70,12 +70,12 @@ object QbsFolderService : SObjectService<QbsFolder>(SMybatisDao(QbsFolder::class
|
|
val planarGraphList = PlanarGraphService.select(
|
|
val planarGraphList = PlanarGraphService.select(
|
|
SFilter.eq("folderId", qbsFolder.id!!),
|
|
SFilter.eq("folderId", qbsFolder.id!!),
|
|
SFilter.eq("projectId", Opts.projectId!!),
|
|
SFilter.eq("projectId", Opts.projectId!!),
|
|
- SFilter.eq("state", 1)
|
|
|
|
|
|
+ SFilter.eq("state", "Draft")
|
|
).exec()
|
|
).exec()
|
|
val planarGraphPubList = planarGraphPubService.select(
|
|
val planarGraphPubList = planarGraphPubService.select(
|
|
SFilter.eq("folderId", qbsFolder.id!!),
|
|
SFilter.eq("folderId", qbsFolder.id!!),
|
|
SFilter.eq("projectId", Opts.projectId!!),
|
|
SFilter.eq("projectId", Opts.projectId!!),
|
|
- SFilter.eq("state", 0)
|
|
|
|
|
|
+ SFilter.eq("state", "Publish")
|
|
).exec()
|
|
).exec()
|
|
if (planarGraphList.size>0||planarGraphPubList.size>0) {
|
|
if (planarGraphList.size>0||planarGraphPubList.size>0) {
|
|
sBaseResponse.message = "文件夹有内容,禁止删除"
|
|
sBaseResponse.message = "文件夹有内容,禁止删除"
|
|
@@ -90,7 +90,7 @@ object QbsFolderService : SObjectService<QbsFolder>(SMybatisDao(QbsFolder::class
|
|
PlanarGraphService.delete(
|
|
PlanarGraphService.delete(
|
|
SFilter.eq("id", qbsFolder.id!!),
|
|
SFilter.eq("id", qbsFolder.id!!),
|
|
SFilter.eq("projectId", Opts.projectId!!),
|
|
SFilter.eq("projectId", Opts.projectId!!),
|
|
- SFilter.eq("state", 4)
|
|
|
|
|
|
+ SFilter.eq("state", "Recyle")
|
|
)
|
|
)
|
|
}
|
|
}
|
|
}
|
|
}
|