1.27

src/main/java/cn/ezhizao/project/system/controller/SysUserController.java

@@ -13,6 +13,7 @@ import cn.ezhizao.project.system.domain.SysDept;
 import cn.ezhizao.project.system.domain.SysDeptUser;
 import cn.ezhizao.project.system.domain.SysRole;
 import cn.ezhizao.project.system.domain.SysUser;
+import cn.ezhizao.project.system.mapper.SysUserMapper;
 import cn.ezhizao.project.system.service.*;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -59,6 +60,9 @@ public class SysUserController extends BaseController {
     @Resource
     private ISysDeptUserService deptUserService;
 
+    @Resource
+    private SysUserMapper sysUserMapper;
+
     /**
      * 获取用户列表
      */
@@ -71,6 +75,14 @@ public class SysUserController extends BaseController {
         List<SysUser> list = userService.selectUserList(user);
         return getDataTable(list);
     }
+
+    @GetMapping("/listByLikeNickNameOrUserName")
+    public TableDataInfo listByLikeNickNameOrUserName(SysUser user) throws NoSuchFieldException, IllegalAccessException {
+        startPage();
+        List<SysUser> userList = userService.listByLikeNickNameOrUserName(user);
+        return getDataTable(userList);
+    }
+
     @GetMapping("/listEmployee")
     public TableDataInfo listEmployee(SysUser user) throws NoSuchFieldException, IllegalAccessException {
         startPage();

src/main/java/cn/ezhizao/project/system/mapper/SysUserMapper.java

@@ -1,6 +1,7 @@
 package cn.ezhizao.project.system.mapper;
 
 import cn.ezhizao.project.system.domain.SysUser;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -161,8 +162,10 @@ public interface SysUserMapper {
 
     /**
      * 根据工段id获取用户信息
-     * @param deptId,username,nickname 用户信息
+     * @param userName,nickname 用户信息
      * @return 用户信息
      */
     public List<SysUser> selectUserItemByDeptId(@Param("userName") String userName,@Param("nickName") String nickName);
+
+    List<SysUser> listByLikeNickNameOrUserName(SysUser user);
 }

src/main/java/cn/ezhizao/project/system/service/ISysUserService.java

@@ -245,9 +245,12 @@ public interface ISysUserService
     SysUser getUserByCode(String userName);
 
     /**
-     * 根据工段id获取用户信息
-     * @param sysUser 用户信息
-     * @return 用户信息
+     *  查询用户信息
+     * @param userName
+     * @param nickName
+     * @return
      */
     List<SysUser> selectUserItemByDeptId(String userName,String nickName);
+
+    List<SysUser> listByLikeNickNameOrUserName(SysUser user);
 }

src/main/java/cn/ezhizao/project/system/service/impl/SysUserServiceImpl.java

@@ -554,4 +554,9 @@ public class SysUserServiceImpl implements ISysUserService {
     public List<SysUser> selectUserItemByDeptId(String userName,String nickName) {
         return userMapper.selectUserItemByDeptId(userName,nickName);
     }
+
+    @Override
+    public List<SysUser> listByLikeNickNameOrUserName(SysUser user) {
+        return userMapper.listByLikeNickNameOrUserName(user);
+    }
 }

src/main/resources/mybatis/system/SysUserMapper.xml

@@ -261,6 +261,14 @@
 	<select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">
 		SELECT user_id, email FROM sys_user WHERE email = #{email} AND del_flag = '0' limit 1
 	</select>
+	<select id="listByLikeNickNameOrUserName" resultType="cn.ezhizao.project.system.domain.SysUser">
+        SELECT * FROM sys_user
+        <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
+			del_flag = '0'
+			<if test="userName != null  and userName != ''"> AND user_name like concat('', #{userName}, '%')</if>
+			<if test="nickName != null  and nickName != ''"> AND nick_name like concat('', #{nickName}, '%')</if>
+        </trim>
+    </select>
 
 	<insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId" >
 		INSERT INTO sys_user(