dianliang/dl_admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
PQZ 2025-04-15 15:44:36 +08:00
parent c70a8879d8
commit b59dab605d
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeServiceImpl.java
View File

@ -565,9 +565,11 @@ public class BusiNoticeServiceImpl extends ServiceImpl<BusiNoticeMapper,BusiNoti
@Override @Override
public IPage<BusiNoticeVo> myPublishNoticeList(AppNoticeQuery query, Page<BusiNotice> page) { public IPage<BusiNoticeVo> myPublishNoticeList(AppNoticeQuery query, Page<BusiNotice> page) {
if (query.getUserId() == null) {
//获取当前登录用户 //获取当前登录用户
Long userId = SecurityUtils.getUserId(); Long userId = SecurityUtils.getUserId();
query.setUserId(userId); query.setUserId(userId);
}
IPage<BusiNoticeVo> pageList = baseMapper.myPublishNoticeList(query, page); IPage<BusiNoticeVo> pageList = baseMapper.myPublishNoticeList(query, page);
List<String> idList = pageList.getRecords().stream().map(BusiNotice::getId).collect(Collectors.toList()); List<String> idList = pageList.getRecords().stream().map(BusiNotice::getId).collect(Collectors.toList());
if(!idList.isEmpty()){ if(!idList.isEmpty()){

2
ruoyi-admin/src/main/java/com/ruoyi/member/vo/MemberUserVO.java
View File

@ -42,4 +42,6 @@ public class MemberUserVO extends MemberUser {
int coupon; int coupon;
/**用户名*/ /**用户名*/
String userName; String userName;
/**类型名称*/
String identityName;
} }

2
ruoyi-admin/src/main/resources/mapper/member/MemberUserMapper.xml
View File

@ -88,6 +88,7 @@
select main.id AS id, select main.id AS id,
main.user_type AS userType, main.user_type AS userType,
main.identity_type AS identityType, main.identity_type AS identityType,
sdd.dict_label AS identityName,
main.user_id AS userId, main.user_id AS userId,
main.tel AS tel, main.tel AS tel,
main.tremaining AS tremaining, main.tremaining AS tremaining,
@ -105,6 +106,7 @@
GROUP_CONCAT(mc.card_name SEPARATOR ', ') AS memberCardName GROUP_CONCAT(mc.card_name SEPARATOR ', ') AS memberCardName
from dl_member_user main from dl_member_user main
LEFT JOIN sys_user su ON main.user_id = su.user_id AND su.del_flag = 0 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 LEFT JOIN dl_member_card mc ON
main.user_id = mc.user_id main.user_id = mc.user_id
AND mc.start_date &lt;= CURDATE() AND mc.start_date &lt;= CURDATE()