From 8876b1b9cd27fad076ea9e5f3e04197b84ba02bd Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 01 八月 2024 14:26:56 +0800
Subject: [PATCH] 代码提交 bug解决
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDeptController.java | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 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..e14672b 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;
@@ -52,10 +52,23 @@
return success(depts);
}
+ @RequiresPermissions("system:dept:list")
+ @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);
+ }
+
/**
* 查询部门列表（排除节点）
*/
-
/**
* 根据部门编号获取详细信息
*/
@@ -102,6 +115,7 @@
@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