From f797479515b7ed01c197bea9408bea4eeb9f3891 Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Thu, 31 Jul 2025 14:22:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=99=AF=E5=8C=BA=E8=B4=A6=E5=8F=B7=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/ycwl/basic/mapper/SourceMapper.java     | 7 +++++++
 .../basic/service/mobile/impl/AppScenicServiceImpl.java   | 6 ++++++
 .../basic/service/pc/impl/ScenicAccountServiceImpl.java   | 8 +++++++-
 src/main/resources/mapper/ScenicAccountMapper.xml         | 4 ++--
 4 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/ycwl/basic/mapper/SourceMapper.java b/src/main/java/com/ycwl/basic/mapper/SourceMapper.java
index 6fde6b0..6cbd958 100644
--- a/src/main/java/com/ycwl/basic/mapper/SourceMapper.java
+++ b/src/main/java/com/ycwl/basic/mapper/SourceMapper.java
@@ -85,4 +85,11 @@ public interface SourceMapper {
     int deleteUselessSource();
     
     int updateMemberIdByFaceId(Long faceId, Long memberId);
+    
+    /**
+     * 根据faceId查询type=2的source列表
+     * @param faceId 人脸ID
+     * @return type=2的source列表
+     */
+    List<SourceEntity> listImageSourcesByFaceId(Long faceId);
 }
diff --git a/src/main/java/com/ycwl/basic/service/mobile/impl/AppScenicServiceImpl.java b/src/main/java/com/ycwl/basic/service/mobile/impl/AppScenicServiceImpl.java
index b6a973c..bca2acb 100644
--- a/src/main/java/com/ycwl/basic/service/mobile/impl/AppScenicServiceImpl.java
+++ b/src/main/java/com/ycwl/basic/service/mobile/impl/AppScenicServiceImpl.java
@@ -103,6 +103,12 @@ public class AppScenicServiceImpl implements AppScenicService {
 
         ScenicLoginRespVO scenicLoginRespVO = new ScenicLoginRespVO();
         BeanUtil.copyProperties(scenicAccount,scenicLoginRespVO);
+        List<Long> scenicIds = scenicAccountMapper.getAccountRelations(scenicAccount.getId());
+        if (!scenicIds.isEmpty()) {
+            scenicLoginRespVO.setScenicId(scenicIds);
+        } else {
+            scenicLoginRespVO.setScenicId(List.of(scenicAccount.getId()));
+        }
         scenicLoginRespVO.setToken(token);
         return ApiResponse.success(scenicLoginRespVO);
     }
diff --git a/src/main/java/com/ycwl/basic/service/pc/impl/ScenicAccountServiceImpl.java b/src/main/java/com/ycwl/basic/service/pc/impl/ScenicAccountServiceImpl.java
index 4c210c7..edd049f 100644
--- a/src/main/java/com/ycwl/basic/service/pc/impl/ScenicAccountServiceImpl.java
+++ b/src/main/java/com/ycwl/basic/service/pc/impl/ScenicAccountServiceImpl.java
@@ -21,7 +21,13 @@ public class ScenicAccountServiceImpl implements ScenicAccountService {
         if (entity.getId() == null) {
             entity.setId(SnowFlakeUtil.getLongId());
         }
-        return mapper.add(entity);
+        int result = mapper.add(entity);
+        if (entity.getScenicId() != null && !entity.getScenicId().isEmpty()) {
+            entity.getScenicId().forEach(scenicId -> {
+                mapper.addAccountScenicRelation(entity.getId(), scenicId, entity.getIsSuper());
+            });
+        }
+        return result;
     }
 
     @Override
diff --git a/src/main/resources/mapper/ScenicAccountMapper.xml b/src/main/resources/mapper/ScenicAccountMapper.xml
index 734ea7d..01ea7ab 100644
--- a/src/main/resources/mapper/ScenicAccountMapper.xml
+++ b/src/main/resources/mapper/ScenicAccountMapper.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.ycwl.basic.mapper.ScenicAccountMapper">
     <insert id="add">
-        insert into scenic_account(id, scenic_id, is_super, name, phone, account, password, create_time, update_time)
-        values (#{id}, #{scenicId}, #{isSuper}, #{name}, #{phone}, #{account}, #{password}, now(), now())
+        insert into scenic_account(id, is_super, name, phone, account, password, create_time, update_time)
+        values (#{id}, #{isSuper}, #{name}, #{phone}, #{account}, #{password}, now(), now())
     </insert>
     <insert id="addAccountScenicRelation">
         insert into account_scenic(account_id, scenic_id, is_admin)