From 1a7a278e32123023fa43bdaa274da778c27b80a0 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期四, 06 十一月 2025 16:34:48 +0800
Subject: [PATCH] 除了视频外需要校验用户是否自己点击了自己的分享

---
 framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java
index 113c83a..fb34c76 100644
--- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java
@@ -644,6 +644,8 @@
         queryWrapper.like(CharSequenceUtil.isNotBlank(memberSearchVO.getNickName()), "nick_name", memberSearchVO.getNickName());
         //鎸夌収鐢佃瘽鍙风爜鏌ヨ
         queryWrapper.like(CharSequenceUtil.isNotBlank(memberSearchVO.getMobile()), "mobile", memberSearchVO.getMobile());
+        //鎸夌収浼氬憳id鏌ヨ
+        queryWrapper.eq(CharSequenceUtil.isNotBlank(memberSearchVO.getMemberId()), "m.id", memberSearchVO.getMemberId());
         //鎸夌収浼氬憳鐘舵�佹煡璇�
         queryWrapper.eq(CharSequenceUtil.isNotBlank(memberSearchVO.getDisabled()), "disabled",
                 memberSearchVO.getDisabled().equals(SwitchEnum.OPEN.name()) ? 1 : 0);
@@ -653,11 +655,9 @@
             String tagIdsStr = memberSearchVO.getTagIds().stream()
                     .map(String::valueOf)
                     .collect(Collectors.joining(","));
-            queryWrapper.inSql("id",
+            queryWrapper.inSql("m.id",
                     "SELECT DISTINCT member_id FROM lmk_member_tag WHERE tag_id IN (" +
                             tagIdsStr + ")");
-
-            return this.baseMapper.pageByMemberVOAndBindStore(PageUtil.initPage(page), queryWrapper);
         }
         return this.baseMapper.pageByMemberVOAndBindStore(PageUtil.initPage(page),queryWrapper);
     }
@@ -736,6 +736,7 @@
         // 鍒涘缓琛ㄥご
         Row header = sheet.createRow(0);
         String[] headers = {
+                "浼氬憳id",
                 "浼氬憳鍚嶇О", "浼氬憳鏄电О","鑱旂郴鏂瑰紡",
                 "娉ㄥ唽鏃堕棿","鏈�鍚庣櫥褰曟椂闂�"
         };
@@ -746,11 +747,12 @@
         for (int i=0;i< exportDetailDTOS.size();i++){
             MemberExportVO dto = exportDetailDTOS.get(i);
             Row row = sheet.createRow(i+1);
-            row.createCell(0).setCellValue(dto.getUsername());
-            row.createCell(1).setCellValue(dto.getNickName());
-            row.createCell(2).setCellValue(dto.getMobile());
-            row.createCell(3).setCellValue(dto.getCreateTime());
-            row.createCell(4).setCellValue(dto.getLastLoginDate());
+            row.createCell(0).setCellValue(dto.getId());
+            row.createCell(1).setCellValue(dto.getUsername());
+            row.createCell(2).setCellValue(dto.getNickName());
+            row.createCell(3).setCellValue(dto.getMobile());
+            row.createCell(4).setCellValue(dto.getCreateTime());
+            row.createCell(5).setCellValue(dto.getLastLoginDate());
         }
 
         return workbook;

--
Gitblit v1.8.0