From 724c79463fc7c4f345fc2dd508aeab139b57afa5 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期日, 24 四月 2022 14:14:54 +0800
Subject: [PATCH] fix

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramFileController.java |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramFileController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramFileController.java
index 1b369ab..eb243c1 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramFileController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramFileController.java
@@ -6,9 +6,11 @@
 import com.sandu.common.object.BaseConditionVO;
 import com.sandu.common.util.ResponseUtil;
 import com.sandu.ximon.admin.param.LEDProgramFileParam;
+import com.sandu.ximon.admin.security.PermissionConfig;
 import com.sandu.ximon.admin.security.SecurityUtils;
 import com.sandu.ximon.admin.service.LEDProgramFileService;
 import com.sandu.ximon.dao.domain.LEDProgramFile;
+import com.sandu.ximon.dao.enums.MenuEnum;
 import lombok.AllArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -25,6 +27,7 @@
 public class LEDProgramFileController {
 
     private final LEDProgramFileService ledProgramFileService;
+    private PermissionConfig permissionConfig;
 
     @PostMapping("/add")
     public ResponseVO<Object> addLEDProgram(@RequestBody @Validated LEDProgramFileParam param) {
@@ -38,11 +41,16 @@
 
     @GetMapping("/list")
     public ResponseVO<Object> listfile(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
-        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
-        LambdaQueryWrapper<LEDProgramFile> wrapper = ledProgramFileService.listFile();
-        if(null!=keyword){
-            wrapper.like(LEDProgramFile::getName,keyword);
+        if (!permissionConfig.check(MenuEnum.LED_FILE_LIST.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
         }
+
+        LambdaQueryWrapper<LEDProgramFile> wrapper = ledProgramFileService.listFile();
+        if (keyword != null&&!keyword.isEmpty()) {
+            wrapper.like(LEDProgramFile::getName, keyword);
+        }
+
+        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
         return ResponseUtil.successPage(ledProgramFileService.list(wrapper));
     }
 

--
Gitblit v1.9.3