From b59dab605dda9d7d76506cee416e252db0373c9f Mon Sep 17 00:00:00 2001 From: PQZ Date: Tue, 15 Apr 2025 15:44:36 +0800 Subject: [PATCH] 1 --- .../ruoyi/busi/service/impl/BusiNoticeServiceImpl.java | 8 +++++--- .../src/main/java/com/ruoyi/member/vo/MemberUserVO.java | 2 ++ .../src/main/resources/mapper/member/MemberUserMapper.xml | 2 ++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeServiceImpl.java index 1a8b036..3b46f4f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeServiceImpl.java @@ -565,9 +565,11 @@ public class BusiNoticeServiceImpl extends ServiceImpl myPublishNoticeList(AppNoticeQuery query, Page page) { - //获取当前登录用户 - Long userId = SecurityUtils.getUserId(); - query.setUserId(userId); + if (query.getUserId() == null) { + //获取当前登录用户 + Long userId = SecurityUtils.getUserId(); + query.setUserId(userId); + } IPage pageList = baseMapper.myPublishNoticeList(query, page); List idList = pageList.getRecords().stream().map(BusiNotice::getId).collect(Collectors.toList()); if(!idList.isEmpty()){ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/vo/MemberUserVO.java b/ruoyi-admin/src/main/java/com/ruoyi/member/vo/MemberUserVO.java index c19e07c..5afc2e1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/member/vo/MemberUserVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/member/vo/MemberUserVO.java @@ -42,4 +42,6 @@ public class MemberUserVO extends MemberUser { int coupon; /**用户名*/ String userName; + /**类型名称*/ + String identityName; } diff --git a/ruoyi-admin/src/main/resources/mapper/member/MemberUserMapper.xml b/ruoyi-admin/src/main/resources/mapper/member/MemberUserMapper.xml index 02e6402..46000a9 100644 --- a/ruoyi-admin/src/main/resources/mapper/member/MemberUserMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/member/MemberUserMapper.xml @@ -88,6 +88,7 @@ select main.id AS id, main.user_type AS userType, main.identity_type AS identityType, + sdd.dict_label AS identityName, main.user_id AS userId, main.tel AS tel, main.tremaining AS tremaining, @@ -105,6 +106,7 @@ GROUP_CONCAT(mc.card_name SEPARATOR ', ') AS memberCardName from dl_member_user main LEFT JOIN sys_user su ON main.user_id = su.user_id AND su.del_flag = 0 + left join (select dict_value,dict_label from sys_dict_data where dict_type = 'dl_identity_type') sdd on main.identity_type = sdd.dict_value LEFT JOIN dl_member_card mc ON main.user_id = mc.user_id AND mc.start_date <= CURDATE()