From a1a50ae80ce2b09af00a6a2972195b3f5617d4bf Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 10 一月 2024 14:20:15 +0800
Subject: [PATCH] bug修改
---
guns-admin/src/main/java/com/stylefeng/guns/modular/api/EncyclopedicKnowledgeController.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 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 688632c..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;
@@ -15,6 +16,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -30,6 +32,8 @@
@Autowired
private ISysDataTypeService sysDataTypeService;
+ @Autowired
+ private IAppUserService appUserService;
@ResponseBody
@@ -37,7 +41,13 @@
@ApiOperation(value = "获取类别", tags = {"知识百科"})
public ResultUtil<List<SysDataType>> getEncyclopedicKnowledgeType(){
List<SysDataType> sysDataType = sysDataTypeService.getSysDataType(1);
- return ResultUtil.success(sysDataType);
+ List<SysDataType> res = new ArrayList<>();
+ // 如果当前类别下 没有内容就不展示了
+ for (SysDataType dataType : sysDataType) {
+ List<EncyclopedicKnowledgeRes> list = encyclopedicKnowledgeService.getEncyclopedicKnowledgeList(dataType.getId());
+ if (list.size()!=0) res.add(dataType);
+ }
+ return ResultUtil.success(res);
}
@@ -62,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