From b5ef65d0103a71dc7af2b9be6d2ac43aca5bb726 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 27 八月 2024 08:59:57 +0800
Subject: [PATCH] 代码提交 bug解决
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDeptController.java | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDeptController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDeptController.java
index 60e5287..d067ba4 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDeptController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDeptController.java
@@ -1,13 +1,15 @@
package com.ruoyi.system.controller;
-import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import java.util.List;
+import com.ruoyi.common.core.web.page.PageInfo;
+import com.ruoyi.system.domain.dto.deptQuery;
import com.ruoyi.system.service.ISysDeptService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
@@ -17,8 +19,6 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.core.constant.UserConstants;
-import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.log.annotation.Log;
@@ -43,7 +43,6 @@
/**
* 获取部门列表
*/
- @RequiresPermissions("system:dept:list")
@GetMapping("/list")
@ApiOperation("获取部门列表")
public AjaxResult list(SysDept dept)
@@ -52,14 +51,25 @@
return success(depts);
}
+ @GetMapping("/pagelist")
+ @ApiOperation("分页获取部门列表")
+ public AjaxResult pagelist(deptQuery dept)
+ {
+ PageInfo<SysDept> pageInfo = new PageInfo<>(dept.getPageCurr(), dept.getPageSize());
+
+ PageInfo<SysDept> page = deptService.page(pageInfo,
+ new LambdaQueryWrapper<SysDept>().orderByDesc(SysDept::getCreateTime)
+ .like(StringUtils.hasLength(dept.getDeptName()), SysDept::getDeptName,
+ dept.getDeptName()).eq(SysDept::getDelFlag, "0"));
+ return AjaxResult.success(page);
+ }
+
/**
* 查询部门列表（排除节点）
*/
-
/**
* 根据部门编号获取详细信息
*/
- @RequiresPermissions("system:dept:query")
@GetMapping(value = "/{deptId}")
@ApiOperation("根据部门编号获取详细信息")
public AjaxResult getInfo(@PathVariable Long deptId)
@@ -71,7 +81,6 @@
/**
* 新增部门
*/
- @RequiresPermissions("system:dept:add")
@ApiOperation("新增部门")
@Log(title = "部门管理", businessType = BusinessType.INSERT)
@PostMapping
@@ -84,7 +93,6 @@
/**
* 修改部门
*/
- @RequiresPermissions("system:dept:edit")
@Log(title = "部门管理", businessType = BusinessType.UPDATE)
@ApiOperation("修改部门")
@PutMapping
@@ -99,9 +107,9 @@
/**
* 删除部门
*/
- @RequiresPermissions("system:dept:remove")
@Log(title = "部门管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{deptId}")
+ @ApiOperation("删除部门管理")
public AjaxResult remove(@PathVariable Long deptId)
{
if (deptService.checkDeptExistUser(deptId))
--
Gitblit v1.7.1