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 7c1a797..b5afc59 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 @@ -27,7 +27,9 @@ import com.ruoyi.common.utils.StringUtils; import com.ruoyi.busi.query.BusiNoticeQuery; import com.ruoyi.constant.DictConstants; import com.ruoyi.member.domain.MemberApply; +import com.ruoyi.member.domain.MemberUser; import com.ruoyi.member.service.IMemberApplyService; +import com.ruoyi.member.service.IMemberUserService; import com.ruoyi.system.service.ISysDictDataService; import com.ruoyi.system.service.ISysDictTypeService; import com.ruoyi.system.service.ISysUserService; @@ -60,7 +62,7 @@ public class BusiNoticeServiceImpl extends ServiceImpl queryWrapperMember =new LambdaQueryWrapper<>(); - queryWrapperMember.eq(MemberApply::getUserId,userDetail.getUserId()).eq(MemberApply::getApprovalStatus,1).last("limit 1"); - MemberApply memberApply = memberApplyService.getOne(queryWrapperMember); - if (null != memberApply){ - userDetailJson.put("identityType",dictDataService.selectDictLabel("dl_identity_type",memberApply.getIdentityType())); + LambdaQueryWrapper queryWrapperMember =new LambdaQueryWrapper<>(); + queryWrapperMember.eq(MemberUser::getUserId,userDetail.getUserId()).eq(MemberUser::getUserType,"01").last("limit 1"); + MemberUser memberUser = memberUserService.getOne(queryWrapperMember); + userDetailJson.put("identityType","未认证"); + if (null != memberUser&&StringUtils.isNotEmpty(memberUser.getIdentityType())){ + userDetailJson.put("identityType",dictDataService.selectDictLabel("dl_identity_type",memberUser.getIdentityType())); } res.put("userDetail",userDetailJson); //已报名用户头像