diff --git a/src/main/java/com/zh/project0512/controller/manage/ReferenceController.java b/src/main/java/com/zh/project0512/controller/manage/ReferenceController.java index 0b81d07..3621fe8 100644 --- a/src/main/java/com/zh/project0512/controller/manage/ReferenceController.java +++ b/src/main/java/com/zh/project0512/controller/manage/ReferenceController.java @@ -196,23 +196,23 @@ public class ReferenceController { @AdminTokenValid @AdminCheckAuthorityAnnotation(jurisdictionId = "109") public Result del(@Validated @RequestBody DelRParam param) { - List rList = referenceService.list(new QueryWrapper().in("id", param.getIdList())); - // 删除素材字段 - referenceService.update(new UpdateWrapper().in("id", param.getIdList()).set("isDeleted", 1)); - //删除素材文件 - for (Reference r : rList) { - if (path != null) { - if (r.getFileUrl() != null) { - new File(path + "/upload" + r.getFileUrl()).delete(); - } - if (r.getCoverUrl() != null) { - new File(path + "/upload" + r.getCoverUrl()).delete(); - } - } - } - //删除素材任务关联 - taskReferenceService.remove(new UpdateWrapper().in("referenceId", param.getIdList())); - return Result.success(); +// List rList = referenceService.list(new QueryWrapper().in("id", param.getIdList())); +// // 删除素材字段 +// referenceService.update(new UpdateWrapper().in("id", param.getIdList()).set("isDeleted", 1)); +// //删除素材文件 +// for (Reference r : rList) { +// if (path != null) { +// if (r.getFileUrl() != null) { +// new File(path + "/upload" + r.getFileUrl()).delete(); +// } +// if (r.getCoverUrl() != null) { +// new File(path + "/upload" + r.getCoverUrl()).delete(); +// } +// } +// } +// //删除素材任务关联 +// taskReferenceService.remove(new UpdateWrapper().in("referenceId", param.getIdList())); + return MybatisPlusUtil.sqlResult( referenceService.update(new UpdateWrapper().in("id", param.getIdList()).set("isDeleted", 1)),"删除"); } diff --git a/src/main/java/com/zh/project0512/controller/manage/TopicActivityController.java b/src/main/java/com/zh/project0512/controller/manage/TopicActivityController.java index ec49a84..40bc513 100644 --- a/src/main/java/com/zh/project0512/controller/manage/TopicActivityController.java +++ b/src/main/java/com/zh/project0512/controller/manage/TopicActivityController.java @@ -76,7 +76,7 @@ public class TopicActivityController { public Result add(@Validated @RequestBody AddTopicParam param) { TopicActivity topicActivity = new TopicActivity() .setTitle(param.getTitle()) - .setSubtitle(param.getSubtitle()) + .setSubtitle(param.getSubtitle().trim()) .setType(param.getType()) .setContent(param.getContent()) .setDuration(param.getDuration())