From a33898c2a0374c249862a2b996e33352e30c8caf Mon Sep 17 00:00:00 2001
From: KonBAI <1527468660@qq.com>
Date: 星期六, 02 四月 2022 13:02:56 +0800
Subject: [PATCH] !167 update 修改角色"菜单树选择项"和"部门树选择项"是否关联显示字段为Boolean类型 * fix 修改 postgres sql脚本，处理角色表字段类型错误问题。 * fix 修复postgreSQL新增或更新角色信息报错。修改角色"菜单树选择项"和"部门树选择项"是否关联显示字段为Boolean类型。
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java
index 9ecc5a7..5bec151 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java
@@ -3,7 +3,8 @@
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -12,7 +13,6 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -26,7 +26,7 @@
*/
@Validated
@Api(value = "绯荤粺璁块棶璁板綍", tags = {"绯荤粺璁块棶璁板綍绠＄悊"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RequiredArgsConstructor
@RestController
@RequestMapping("/monitor/logininfor")
public class SysLogininforController extends BaseController {
@@ -36,14 +36,14 @@
@ApiOperation("鏌ヨ绯荤粺璁块棶璁板綍鍒楄〃")
@SaCheckPermission("monitor:logininfor:list")
@GetMapping("/list")
- public TableDataInfo<SysLogininfor> list(SysLogininfor logininfor) {
- return logininforService.selectPageLogininforList(logininfor);
+ public TableDataInfo<SysLogininfor> list(SysLogininfor logininfor, PageQuery pageQuery) {
+ return logininforService.selectPageLogininforList(logininfor, pageQuery);
}
@ApiOperation("瀵煎嚭绯荤粺璁块棶璁板綍鍒楄〃")
@Log(title = "鐧诲綍鏃ュ織", businessType = BusinessType.EXPORT)
@SaCheckPermission("monitor:logininfor:export")
- @GetMapping("/export")
+ @PostMapping("/export")
public void export(SysLogininfor logininfor, HttpServletResponse response) {
List<SysLogininfor> list = logininforService.selectLogininforList(logininfor);
ExcelUtil.exportExcel(list, "鐧诲綍鏃ュ織", SysLogininfor.class, response);
@@ -53,7 +53,7 @@
@SaCheckPermission("monitor:logininfor:remove")
@Log(title = "鐧诲綍鏃ュ織", businessType = BusinessType.DELETE)
@DeleteMapping("/{infoIds}")
- public AjaxResult<Void> remove(@PathVariable Long[] infoIds) {
+ public R<Void> remove(@PathVariable Long[] infoIds) {
return toAjax(logininforService.deleteLogininforByIds(infoIds));
}
@@ -61,8 +61,8 @@
@SaCheckPermission("monitor:logininfor:remove")
@Log(title = "鐧诲綍鏃ュ織", businessType = BusinessType.CLEAN)
@DeleteMapping("/clean")
- public AjaxResult<Void> clean() {
+ public R<Void> clean() {
logininforService.cleanLogininfor();
- return AjaxResult.success();
+ return R.ok();
}
}
--
Gitblit v1.9.3