From c178011e0ae7618723d88dad21160d87447fd57c Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期二, 02 一月 2024 10:57:54 +0800
Subject: [PATCH] 小程序二维码

---
 guns-admin/src/main/java/com/stylefeng/guns/modular/api/EncyclopedicKnowledgeController.java |   27 ++++++++++++++++++++++++---
 1 files changed, 24 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..39f705f 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,18 +1,22 @@
 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;
 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;
 
 /**
@@ -28,6 +32,8 @@
 
     @Autowired
     private ISysDataTypeService sysDataTypeService;
+    @Autowired
+    private IAppUserService appUserService;
 
 
     @ResponseBody
@@ -35,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);
     }
 
 
@@ -60,6 +72,7 @@
             @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);
     }
@@ -73,6 +86,14 @@
             @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