diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberBlacklistController.java b/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberBlacklistController.java index 6b584f6..ed29c1f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberBlacklistController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberBlacklistController.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.member.domain.MemberApply; import com.ruoyi.member.vo.MemberApplyVO; +import com.ruoyi.member.vo.MemberBlacklistVO; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -50,19 +51,7 @@ public class MemberBlacklistController extends BaseController @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { Page page = new Page<>(pageNum, pageSize); - IPage list = memberBlacklistService.queryListPage(blacklist, page); - return success(list); - } - - /** - * 查询黑名单列表 - */ - @PreAuthorize("@ss.hasPermi('member:blacklist:list')") - @GetMapping("/list") - public AjaxResult list(MemberBlacklist memberBlacklist) - { - - List list = memberBlacklistService.list(); + IPage list = memberBlacklistService.queryListPage(blacklist, page); return success(list); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/mapper/MemberBlacklistMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/member/mapper/MemberBlacklistMapper.java index b50ad66..1380409 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/member/mapper/MemberBlacklistMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/member/mapper/MemberBlacklistMapper.java @@ -8,6 +8,7 @@ import com.ruoyi.member.domain.MemberApply; import com.ruoyi.member.domain.MemberBlacklist; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.member.vo.MemberApplyVO; +import com.ruoyi.member.vo.MemberBlacklistVO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -28,5 +29,5 @@ public interface MemberBlacklistMapper extends BaseMapper { * @author PQZ * @date 9:54 2025/3/18 **/ - IPage queryListPage(@Param("entity") MemberBlacklist entity, Page page); + IPage queryListPage(@Param("entity") MemberBlacklist entity, Page page); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberBlacklistService.java b/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberBlacklistService.java index a1dc99f..8ae1ddd 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberBlacklistService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberBlacklistService.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.member.domain.MemberBlacklist; +import com.ruoyi.member.vo.MemberBlacklistVO; /** * 黑名单Service接口 @@ -24,5 +25,5 @@ public interface IMemberBlacklistService extends IService { * @author PQZ * @date 17:28 2025/4/14 **/ - IPage queryListPage(MemberBlacklist blacklist, Page page); + IPage queryListPage(MemberBlacklist blacklist, Page page); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberBlacklistServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberBlacklistServiceImpl.java index 8923e75..66bfc11 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberBlacklistServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberBlacklistServiceImpl.java @@ -5,6 +5,7 @@ import java.util.List; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.member.vo.MemberBlacklistVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -35,7 +36,7 @@ public class MemberBlacklistServiceImpl extends ServiceImpl queryListPage(MemberBlacklist blacklist, Page page) { + public IPage queryListPage(MemberBlacklist blacklist, Page page) { return memberBlacklistMapper.queryListPage(blacklist,page); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/vo/MemberBlacklistVO.java b/ruoyi-admin/src/main/java/com/ruoyi/member/vo/MemberBlacklistVO.java new file mode 100644 index 0000000..cf48b7a --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/member/vo/MemberBlacklistVO.java @@ -0,0 +1,12 @@ +package com.ruoyi.member.vo; + +import com.ruoyi.member.domain.MemberBlacklist; +import lombok.Data; + +@Data +public class MemberBlacklistVO extends MemberBlacklist { + /**昵称*/ + String nickName; + /**申请时间段止*/ + String avatar; +} diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 070d060..e48f5d6 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -16,7 +16,7 @@ ruoyi: # 开发环境配置 server: # 服务器的HTTP端口,默认为8080 - port: 8080 + port: 8081 servlet: # 应用的访问路径 context-path: / diff --git a/ruoyi-admin/src/main/resources/mapper/member/MemberBlacklistMapper.xml b/ruoyi-admin/src/main/resources/mapper/member/MemberBlacklistMapper.xml index d50ba64..c62c89a 100644 --- a/ruoyi-admin/src/main/resources/mapper/member/MemberBlacklistMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/member/MemberBlacklistMapper.xml @@ -19,8 +19,18 @@ select id, user_id, black_user_id, black_user_type, creator, create_time, updater, update_time, del_flag from dl_member_blacklist - + SELECT + main.id AS id, + su.nick_name AS nickName, + su.avatar AS avatar, + main.create_time AS createTime + FROM + dl_member_blacklist main + LEFT JOIN sys_user su ON main.black_user_id = su.user_id AND su.del_flag = 0 + WHERE + main.del_flag = 0 + and main.user_id = #{entity.userId}