diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceProServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceProServiceImpl.java index 2ad74d9..69e8362 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceProServiceImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceProServiceImpl.java @@ -240,7 +240,7 @@ public class DeviceProServiceImpl implements IDeviceProService { wrapper.eq(DeviceProUserEntity::getDeviceProId,proId); if (ObjectUtil.isNotEmpty(searchValue)){ - wrapper.like(DeviceProUserEntity::getUserName,searchValue); + wrapper.like(DeviceProUserEntity::getNickName,searchValue); } Page pagination = deviceProUserMapper.selectPage(pageQuery, wrapper); diff --git a/dk-modules/system/src/main/resources/mapper/system/SysUserMapper.xml b/dk-modules/system/src/main/resources/mapper/system/SysUserMapper.xml index 40e2a67..4b35648 100644 --- a/dk-modules/system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/dk-modules/system/src/main/resources/mapper/system/SysUserMapper.xml @@ -109,6 +109,9 @@ and u.user_name like concat('%',#{param.userName},'%') + + and u.dept_id = #{param.deptId} +