对接修改

ktg-admin/src/main/java/com/ktg/web/controller/system/SysUserController.java

@@ -62,9 +62,8 @@ public class SysUserController extends BaseController
      * 获取用户列表
      */
     @GetMapping("/list")
-    public TableDataInfo list(SysUser user)
+    public TableDataInfo list(SysUser user, Integer pageNum, Integer pageSize)
     {
-        startPage();
         List<SysUser> list = userService.selectUserList(user);
         return getDataTable(list);
     }

ktg-system/src/main/java/com/ktg/system/service/impl/SysUserServiceImpl.java

@@ -29,6 +29,8 @@ import javax.validation.Validator;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static com.ktg.common.utils.PageUtils.startPage;
+
 /**
  * 用户 业务层处理
  *
@@ -107,6 +109,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             userIds.addAll(workUserIds);
         }
         user.setUserIds(userIds);
+        startPage();
         List<SysUser> sysUsers = userMapper.selectUserList(user);
         // 查询用户角色
         for (SysUser sysUser : sysUsers) {

ktg-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -80,6 +80,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="userName != null and userName != ''">
 			AND u.user_name like concat('%', #{userName}, '%')
 		</if>
+		<if test="nickName != null and nickName != ''">
+			AND u.nick_name like concat('%', #{nickName}, '%')
+		</if>
 		<if test="status != null and status != ''">
 			AND u.status = #{status}
 		</if>