From 83d3dbeb477e1bae7b9f80cbe46c4e4c619175b5 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 30 Sep 2024 16:33:41 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.122:9527/r/cms into xincheng
---
src/main/java/com/xcong/farmer/cms/modules/core/controller/CmsCoreController.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/xcong/farmer/cms/modules/core/controller/CmsCoreController.java b/src/main/java/com/xcong/farmer/cms/modules/core/controller/CmsCoreController.java
index a702299..23f8b67 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/core/controller/CmsCoreController.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/core/controller/CmsCoreController.java
@@ -28,8 +28,8 @@
@ApiOperation(value = "发布文章", notes = "发布文章")
@PostMapping(value = "releaseArticle/{id}")
public Result releaseArticle(@PathVariable("id") Long id) {
-// Long companyId = LoginUserUtil.getCompanyId();
- Long companyId = 24L;
+ Long companyId = LoginUserUtil.getCompanyId();
+// Long companyId = 24L;
releaseService.releaseArticle(id, companyId);
return Result.ok("success");
}
@@ -37,8 +37,8 @@
@ApiOperation(value = "发布栏目", notes = "发布栏目")
@PostMapping(value = "releaseColumn/{type}/{id}")
public Result releaseColumn(@PathVariable("id") Long id, @PathVariable("type") Integer type) {
-// Long companyId = LoginUserUtil.getCompanyId();
- Long companyId = 24L;
+ Long companyId = LoginUserUtil.getCompanyId();
+// Long companyId = 24L;
releaseService.releaseColumn(id, type, companyId);
return Result.ok("success");
}
@@ -46,8 +46,8 @@
@ApiOperation(value = "发布首页", notes = "发布首页")
@PostMapping(value = "/releaseIndex")
public Result releaseIndex() {
-// Long companyId = LoginUserUtil.getCompanyId();
- Long companyId = 24L;
+ Long companyId = LoginUserUtil.getCompanyId();
+// Long companyId = 24L;
releaseService.releaseIndex(companyId, true);
return Result.ok("success");
}
@@ -55,8 +55,8 @@
@ApiOperation(value = "发布全站", notes = "发布全站")
@PostMapping(value = "/releaseAll")
public Result releaseAll() {
-// Long companyId = LoginUserUtil.getCompanyId();
- Long companyId = 24L;
+ Long companyId = LoginUserUtil.getCompanyId();
+// Long companyId = 24L;
releaseService.releaseAll(companyId);
return Result.ok("发布成功");
}
--
Gitblit v1.9.1