Merge branch 'V20230915' of http://192.168.60.201/root/dsk-operate-sys into V20230915

dsk-system/src/main/java/com/dsk/system/service/SysLoginService.java

@@ -561,12 +561,14 @@ public class SysLoginService {
                     .eq(SysUser::getPhonenumber, username)
                     .orderByDesc(SysUser::getUserId);
 //                sysUsers = userMapper.selectUserByTenantPhone(username);
+                sysUsers = userMapper.selectList(lqw);
             } else {
                 LambdaQueryWrapper<SysUser> lqw = new LambdaQueryWrapper<SysUser>()
                     .select(SysUser::getUserName, SysUser::getStatus, SysUser::getTenantId)
                     .eq(SysUser::getUserName, username)
                     .orderByDesc(SysUser::getUserId);
 //                sysUsers = userMapper.selectUserByTenantUsername(username);
+                sysUsers = userMapper.selectList(lqw);
             }
             return sysUsers;
         });