From 5fac00120acdfad0d80db84a976b605f6dc2c5a2 Mon Sep 17 00:00:00 2001
From: luo <2855143437@qq.com>
Date: 星期二, 02 一月 2024 15:12:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
guns-admin/src/main/java/com/stylefeng/guns/modular/api/EncyclopedicKnowledgeController.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/guns-admin/src/main/java/com/stylefeng/guns/modular/api/EncyclopedicKnowledgeController.java b/guns-admin/src/main/java/com/stylefeng/guns/modular/api/EncyclopedicKnowledgeController.java
index 44ac2ec..6f0e54c 100644
--- a/guns-admin/src/main/java/com/stylefeng/guns/modular/api/EncyclopedicKnowledgeController.java
+++ b/guns-admin/src/main/java/com/stylefeng/guns/modular/api/EncyclopedicKnowledgeController.java
@@ -1,5 +1,6 @@
package com.stylefeng.guns.modular.api;
+import com.stylefeng.guns.modular.system.model.AppUser;
import com.stylefeng.guns.modular.system.model.EncyclopedicKnowledge;
import com.stylefeng.guns.modular.system.model.SysDataType;
import com.stylefeng.guns.modular.system.service.IAppUserService;
@@ -31,6 +32,8 @@
@Autowired
private ISysDataTypeService sysDataTypeService;
+ @Autowired
+ private IAppUserService appUserService;
@ResponseBody
@@ -69,19 +72,24 @@
@ApiImplicitParam(name = "Authorization", value = "Bearer eyJhbGciOiJIUzUxMiJ....", required = false, paramType = "header")
})
public ResultUtil<EncyclopedicKnowledgeInfoRes> getEncyclopedicKnowledgeInfo(Integer id){
+
EncyclopedicKnowledgeInfoRes encyclopedicKnowledgeInfo = encyclopedicKnowledgeService.getEncyclopedicKnowledgeInfo(id);
return ResultUtil.success(encyclopedicKnowledgeInfo);
}
@ResponseBody
- @PostMapping("/api/encyclopedicKnowledge/upvoteEncyclopedicKnowledge")
+ @PostMapping("/base/encyclopedicKnowledge/upvoteEncyclopedicKnowledge")
@ApiOperation(value = "点赞/取消点赞", tags = {"知识百科"})
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "数据id", required = true),
@ApiImplicitParam(name = "Authorization", value = "Bearer eyJhbGciOiJIUzUxMiJ....", required = true, paramType = "header")
})
public ResultUtil upvoteEncyclopedicKnowledge(Integer id){
+ AppUser appUser = appUserService.getAppUser();
+ if(null != appUser && (appUser.getStatus() == 2|| appUser.getStatus() == 3)){
+ return ResultUtil.errorLogin("当前账号已被冻结或删除");
+ }
return encyclopedicKnowledgeService.upvoteEncyclopedicKnowledge(id);
}
--
Gitblit v1.7.1