From d4028a36e0167a9b0f265fd00dbfe61ceb78e605 Mon Sep 17 00:00:00 2001
From: 13405411873 <1994398261@qq.com>
Date: Sat, 29 Mar 2025 11:54:38 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E5=91=8A=E8=AF=A6=E6=83=85=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../busi/service/impl/BusiNoticeServiceImpl.java  | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 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 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<BusiNoticeMapper,BusiNoti
     @Autowired
     private ISysUserService userService;
     @Autowired
-    private IMemberApplyService memberApplyService;
+    private IMemberUserService memberUserService;
     @Autowired
     private ISysDictDataService dictDataService;
 
@@ -244,11 +246,12 @@ public class BusiNoticeServiceImpl extends ServiceImpl<BusiNoticeMapper,BusiNoti
         userDetailJson.put("nickName",userDetail.getNickName());
         userDetailJson.put("avatar",Optional.ofNullable(userDetail.getAvatar()).orElse(""));
         //关联认证表
-        LambdaQueryWrapper<MemberApply> 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<MemberUser> 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);
         //已报名用户头像