From 8444084e6aa11efa23287e7f82474ac22378a5c4 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 01 四月 2025 16:03:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberArchiveServiceImpl.java |   31 +++++++++++++++++++++++++++++--
 1 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberArchiveServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberArchiveServiceImpl.java
index 3fa2495..c008c55 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberArchiveServiceImpl.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberArchiveServiceImpl.java
@@ -1,5 +1,6 @@
 package com.ruoyi.member.service.impl.member;
 
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.ruoyi.member.domain.pojo.member.MemberArchive;
 import com.ruoyi.member.domain.vo.MemberArchiveVo;
 import com.ruoyi.member.mapper.member.MemberArchiveMapper;
@@ -25,12 +26,38 @@
     private MemberArchiveMapper memberArchiveMapper;
 
     /**
+     * 获取用户档案去除空信息
+     * @param userId
+     * @return
+     */
+    @Override
+    public List<MemberArchiveVo> listMgtVoByUserId(Long userId){
+        return memberArchiveMapper.listMgtVoByUserId(userId);
+    }
+
+    /**
      * 获取用户档案
      * @param userId
      * @return
      */
     @Override
-    public List<MemberArchiveVo> listVoByUserId(Long userId){
-        return memberArchiveMapper.listVoByUserId(userId);
+    public List<MemberArchiveVo> listMerVoByUserId(Long userId){
+        return memberArchiveMapper.listMerVoByUserId(userId);
+    }
+
+    /**
+     * @description  删除用户档案
+     * @author  jqs
+     * @date    2023/6/30 15:11
+     * @param userId
+     * @return  void
+     */
+    @Override
+    public void deleteByUserId(Long userId){
+        LambdaUpdateWrapper<MemberArchive> updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper.set(MemberArchive::getDelFlag,1);
+        updateWrapper.eq(MemberArchive::getDelFlag,0);
+        updateWrapper.eq(MemberArchive::getUserId,userId);
+        this.update(updateWrapper);
     }
 }

--
Gitblit v1.7.1