From 8b4591b39ede7e4dddf7108658762dbad947111c Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 06 Mar 2023 17:12:51 +0800
Subject: [PATCH] 设备模糊查询、用户查询
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 6 ++++++
src/main/java/org/springblade/modules/device/mapper/DeviceMapper.java | 3 ++-
src/main/java/org/springblade/modules/device/mapper/DeviceMapper.xml | 6 +++++-
3 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/device/mapper/DeviceMapper.java b/src/main/java/org/springblade/modules/device/mapper/DeviceMapper.java
index 70e5b88..72ce16c 100644
--- a/src/main/java/org/springblade/modules/device/mapper/DeviceMapper.java
+++ b/src/main/java/org/springblade/modules/device/mapper/DeviceMapper.java
@@ -16,6 +16,7 @@
*/
package org.springblade.modules.device.mapper;
+import org.apache.ibatis.annotations.Param;
import org.springblade.modules.device.entity.DeviceEntity;
import org.springblade.modules.device.vo.DeviceVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -37,7 +38,7 @@
* @param device
* @return
*/
- List<DeviceVO> selectDevicePage(IPage page, DeviceVO device);
+ List<DeviceVO> selectDevicePage(IPage page, @Param("device") DeviceVO device);
}
diff --git a/src/main/java/org/springblade/modules/device/mapper/DeviceMapper.xml b/src/main/java/org/springblade/modules/device/mapper/DeviceMapper.xml
index e502e76..3259baf 100644
--- a/src/main/java/org/springblade/modules/device/mapper/DeviceMapper.xml
+++ b/src/main/java/org/springblade/modules/device/mapper/DeviceMapper.xml
@@ -21,7 +21,11 @@
<select id="selectDevicePage" resultMap="deviceResultMap">
- select * from sys_device where is_deleted = 0
+ select * from sys_device
+ where is_deleted = 0
+ <if test="device.name !=null and device.name !=''">
+ AND name LIKE CONCAT('%',#{device.name},'%')
+ </if>
</select>
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
index e6cda16..be9604a 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -60,6 +60,12 @@
<if test="user.phone !=null and user.phone !='' ">
AND phone LIKE CONCAT('%',#{user.phone},'%')
</if>
+ <if test="user.roleId !=null and user.roleId !=''">
+ AND FIND_IN_SET(role_id,#{user.roleId})
+ </if>
+ <if test="user.deptId !=null and user.deptId !=''">
+ AND dept_id = #{user.deptId}
+ </if>
ORDER BY id
</select>
--
Gitblit v1.9.3