[feat]

1、修改设备组管理相关问题③

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<DeviceProUserEntity> pagination = deviceProUserMapper.selectPage(pageQuery, wrapper);

dk-modules/system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -109,6 +109,9 @@
             <if test="param.userName != null and param.userName != ''">
                 and u.user_name like concat('%',#{param.userName},'%')
             </if>
+            <if test="param.deptId != null and param.deptId != ''">
+                and u.dept_id = #{param.deptId}
+            </if>
         </where>
     </select>