From 5667d14c708f9244fe2419707f98ff472ca23480 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期二, 30 七月 2024 16:30:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDeptController.java | 9 ++-------
1 files changed, 2 insertions(+), 7 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 b80814c..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,18 +1,15 @@
package com.ruoyi.system.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import java.util.List;
import com.ruoyi.common.core.web.page.PageInfo;
-import com.ruoyi.system.api.domain.SysRole;
import com.ruoyi.system.domain.dto.deptQuery;
import com.ruoyi.system.service.ISysDeptService;
-import io.seata.common.util.StringUtils;
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;
@@ -22,7 +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.web.controller.BaseController;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.log.annotation.Log;
@@ -65,7 +61,7 @@
PageInfo<SysDept> page = deptService.page(pageInfo,
new LambdaQueryWrapper<SysDept>().orderByDesc(SysDept::getCreateTime)
- .like(StringUtils.isNotBlank(dept.getDeptName()), SysDept::getDeptName,
+ .like(StringUtils.hasLength(dept.getDeptName()), SysDept::getDeptName,
dept.getDeptName()).eq(SysDept::getDelFlag, "0"));
return AjaxResult.success(page);
}
@@ -73,7 +69,6 @@
/**
* 查询部门列表（排除节点）
*/
-
/**
* 根据部门编号获取详细信息
*/
--
Gitblit v1.7.1