Merge branch 'system-zyj' of uskycloud/usky-cloud into system-165

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/controller/web/UserConfigController.java

@@ -136,8 +136,9 @@ public class UserConfigController extends BaseController {
     public ApiResult<CommonPage<SysUser>> getUserList(@RequestParam(value = "tenantId", required = false, defaultValue = "0") Integer tenantId,
                                                       @RequestParam(value = "page", required = false, defaultValue = "0") Integer page,
                                                       @RequestParam(value = "size", required = false, defaultValue = "0") Integer size,
-                                                      @RequestParam(value = "userId", required = false, defaultValue = "0") long userId) {
-        return ApiResult.success(userService.userList(tenantId, page, size, userId));
+                                                      @RequestParam(value = "userId", required = false, defaultValue = "0") long userId,
+                                                      @RequestParam(value = "nickName",required = false) String nickName) {
+        return ApiResult.success(userService.userList(tenantId, page, size, userId, nickName));
     }
 
 

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysUserMapper.java

@@ -148,7 +148,8 @@ public interface SysUserMapper extends CrudMapper<SysUser> {
     public List<SysUser> getUserData(@Param("tenantId") Integer tenantId,
                                      @Param("current") Integer current,
                                      @Param("size") Integer size,
-                                     @Param("userId") long userId);
+                                     @Param("userId") long userId,
+                                     @Param("nickName") String nickName);
 
     public List<SysUser> userList(@Param("tenantId") Integer tenantId,
                                   @Param("userName") String userName);

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/ISysUserService.java

@@ -229,7 +229,7 @@ public interface ISysUserService extends CrudService<SysUser> {
 
     public int resetUserPwdOne(Long userId, String password);
 
-    public CommonPage<SysUser> userList(Integer tenantId, Integer page, Integer size, long userId);
+    public CommonPage<SysUser> userList(Integer tenantId, Integer page, Integer size, long userId, String nickName);
 
     public List<SysUser> userList();
 

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysUserServiceImpl.java

@@ -574,8 +574,8 @@ public class SysUserServiceImpl extends AbstractCrudService<SysUserMapper, SysUs
 
 
     @Override
-    public CommonPage<SysUser> userList(Integer tenantId, Integer page, Integer size, long userId) {
-        List<SysUser> list1 = userMapper.getUserData(tenantId, null, null, userId);
+    public CommonPage<SysUser> userList(Integer tenantId, Integer page, Integer size, long userId, String nickName) {
+        List<SysUser> list1 = userMapper.getUserData(tenantId, null, null, userId, nickName);
         int total = 0;
         if (list1.size() > 0) {
             total = list1.size();
@@ -584,7 +584,7 @@ public class SysUserServiceImpl extends AbstractCrudService<SysUserMapper, SysUs
         if (page != null && size > 0) {
             current = (page - 1) * size;
         }
-        List<SysUser> list = userMapper.getUserData(tenantId, current, size, userId);
+        List<SysUser> list = userMapper.getUserData(tenantId, current, size, userId, nickName);
         return new CommonPage<>(list, total, size, page);
     }
 

base-modules/service-system/service-system-biz/src/main/resources/mapper/system/SysUserMapper.xml

@@ -275,6 +275,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="userId != null and userId != 0">
 			and user_id = #{userId}
 		</if>
+		<if test="nickName != null and nickName != ''">
+			and nick_name like concat('%', #{nickName}, '%')
+		</if>
 		order by user_id
 		<if test="current != null and size != null and size != 0">
 			limit #{current},#{size}