From c060df1d22f23f059c03c432b6ff420bcb9801cf Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 18 五月 2022 15:41:41 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramFileController.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 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 621da8e..fe5fa1c 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
@@ -7,7 +7,6 @@
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;
@@ -31,24 +30,32 @@
@PostMapping("/add")
public ResponseVO<Object> addLEDProgram(@RequestBody @Validated LEDProgramFileParam param) {
+ if (!permissionConfig.check(MenuEnum.LED_FILE_N_ADD.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
return ResponseUtil.success(ledProgramFileService.addProgramFile(param));
}
@PostMapping("/delete/{fileId}")
public ResponseVO<Object> deleteLEDProgram(@PathVariable Long fileId) {
+ if (!permissionConfig.check(MenuEnum.LED_FILE_N_DELETE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
return ResponseUtil.success(ledProgramFileService.deleteFile(fileId));
}
@GetMapping("/list")
public ResponseVO<Object> listfile(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
- if (!permissionConfig.check(MenuEnum.LED_FILE_LIST.getCode())) {
+ if (!permissionConfig.check(MenuEnum.LED_FILE_S_LIST.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+
LambdaQueryWrapper<LEDProgramFile> wrapper = ledProgramFileService.listFile();
- if(null!=keyword){
- wrapper.like(LEDProgramFile::getName,keyword);
+ 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