From 23c4967b4cb8dbce8277f830f7152d315c5a4a57 Mon Sep 17 00:00:00 2001
From: luo <2855143437@qq.com>
Date: 星期一, 25 十二月 2023 09:25:17 +0800
Subject: [PATCH] 12.25
---
guns-admin/src/main/java/com/stylefeng/guns/modular/api/EncyclopedicKnowledgeController.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 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 df3893c..44ac2ec 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
@@ -2,17 +2,20 @@
import com.stylefeng.guns.modular.system.model.EncyclopedicKnowledge;
import com.stylefeng.guns.modular.system.model.SysDataType;
+import com.stylefeng.guns.modular.system.service.IAppUserService;
import com.stylefeng.guns.modular.system.service.IEncyclopedicKnowledgeService;
import com.stylefeng.guns.modular.system.service.ISysDataTypeService;
import com.stylefeng.guns.modular.system.util.ResultUtil;
-import com.stylefeng.guns.modular.system.warpper.res.EncyclopedicKnowledgeInfoRes;
-import com.stylefeng.guns.modular.system.warpper.res.EncyclopedicKnowledgeRes;
+import com.stylefeng.guns.modular.system.warpper.req.SearchHouseResourceReq;
+import com.stylefeng.guns.modular.system.warpper.req.SearchIntermediaryReq;
+import com.stylefeng.guns.modular.system.warpper.res.*;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -35,7 +38,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);
}
@@ -75,4 +84,8 @@
public ResultUtil upvoteEncyclopedicKnowledge(Integer id){
return encyclopedicKnowledgeService.upvoteEncyclopedicKnowledge(id);
}
+
+
+
+
}
--
Gitblit v1.7.1