From 5caf9a0ebf45f1d9aa0e638517fcf5c7b3f4f789 Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Thu, 1 Jan 2026 19:40:45 +0800
Subject: [PATCH] =?UTF-8?q?refactor(face):=20=E9=87=8D=E6=9E=84=E4=BA=BA?=
 =?UTF-8?q?=E8=84=B8=E6=9C=8D=E5=8A=A1=E6=8E=A5=E5=8F=A3=E5=92=8C=E5=AE=9E?=
 =?UTF-8?q?=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改 getById 方法返回类型为 FaceEntity 并直接调用仓库层
- 移除删除人脸时的用户权限检查逻辑
- 删除 contentListUseDefaultFace 方法的实现
- 从服务接口中移除 contentListUseDefaultFace 方法定义
---
 .../basic/controller/mobile/AppFaceController.java   | 12 +++---------
 .../java/com/ycwl/basic/service/pc/FaceService.java  |  2 --
 .../ycwl/basic/service/pc/impl/FaceServiceImpl.java  |  7 -------
 3 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/ycwl/basic/controller/mobile/AppFaceController.java b/src/main/java/com/ycwl/basic/controller/mobile/AppFaceController.java
index 511432d5..5dfb40b8 100644
--- a/src/main/java/com/ycwl/basic/controller/mobile/AppFaceController.java
+++ b/src/main/java/com/ycwl/basic/controller/mobile/AppFaceController.java
@@ -64,23 +64,17 @@ public class AppFaceController {
     }
 
     @GetMapping("/{faceId}")
-    public ApiResponse<FaceRespVO> getById(@PathVariable("faceId") Long faceId) {
-        return faceService.getById(faceId);
+    public ApiResponse<FaceEntity> getById(@PathVariable("faceId") Long faceId) {
+        FaceEntity face = faceRepository.getFace(faceId);
+        return ApiResponse.success(face);
     }
 
     @DeleteMapping("/{faceId}")
     public ApiResponse<String> deleteFace(@PathVariable("faceId") Long faceId) {
-        // 添加权限检查：验证当前用户是否拥有该 face
-        JwtInfo worker = JwtTokenUtil.getWorker();
-        Long userId = worker.getUserId();
-
         FaceEntity face = faceRepository.getFace(faceId);
         if (face == null) {
             throw new BaseException("人脸数据不存在");
         }
-        if (!face.getMemberId().equals(userId)) {
-            throw new BaseException("无权删除此人脸");
-        }
 
         return faceService.deleteFace(faceId);
     }
diff --git a/src/main/java/com/ycwl/basic/service/pc/FaceService.java b/src/main/java/com/ycwl/basic/service/pc/FaceService.java
index 90b2b802..2083ca79 100644
--- a/src/main/java/com/ycwl/basic/service/pc/FaceService.java
+++ b/src/main/java/com/ycwl/basic/service/pc/FaceService.java
@@ -40,8 +40,6 @@ public interface FaceService {
 
     List<ContentPageVO> faceContentList(Long faceId);
 
-    ApiResponse<List<ContentPageVO>> contentListUseDefaultFace();
-
     void bindFace(Long faceId, Long memberId);
 
     String bindWxaCode(Long faceId);
diff --git a/src/main/java/com/ycwl/basic/service/pc/impl/FaceServiceImpl.java b/src/main/java/com/ycwl/basic/service/pc/impl/FaceServiceImpl.java
index 99e17a78..40edcedb 100644
--- a/src/main/java/com/ycwl/basic/service/pc/impl/FaceServiceImpl.java
+++ b/src/main/java/com/ycwl/basic/service/pc/impl/FaceServiceImpl.java
@@ -677,13 +677,6 @@ public class FaceServiceImpl implements FaceService {
         return contentList;
     }
 
-    @Override
-    public ApiResponse<List<ContentPageVO>> contentListUseDefaultFace() {
-        FaceRespVO lastFaceByUserId = faceMapper.findLastFaceByUserId(BaseContextHandler.getUserId());
-        List<ContentPageVO> contentPageVOS = faceContentList(lastFaceByUserId.getId());
-        return ApiResponse.success(contentPageVOS);
-    }
-
     @Override
     public void bindFace(Long faceId, Long memberId) {
         FaceEntity face = faceRepository.getFace(faceId);