From ce2ee251ae8fec8d1b4a0fd5ed7a8ec982e0167a Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Fri, 18 Apr 2025 12:54:47 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BF=E5=AE=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pjcloud/integrated/dto/visitor/app/VisitorsAppDTO.java   | 5 ++---
 .../com/bsd/pjcloud/integrated/entity/VisitorsEntity.java    | 3 +++
 .../pjcloud/integrated/service/impl/VisitorsServiceImpl.java | 2 ++
 .../src/main/resources/mapper/VisitorsMapper.xml             | 1 +
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/dto/visitor/app/VisitorsAppDTO.java b/pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/dto/visitor/app/VisitorsAppDTO.java
index deed018df..9f4f5ec70 100644
--- a/pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/dto/visitor/app/VisitorsAppDTO.java
+++ b/pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/dto/visitor/app/VisitorsAppDTO.java
@@ -104,9 +104,8 @@ public class VisitorsAppDTO {
 	@Schema(description="是否有随行人员 0 否 1是")
 	private String isOtherPeople;
 
-
-	@Schema(description="用户id")
-	private Long userId;
+	@Schema(description="接待人id")
+	private Long receiveId;
 
 	@Schema(description="车牌号集合")
 	private List<VisitorsCarAppDTO> carList;
diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/entity/VisitorsEntity.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/entity/VisitorsEntity.java
index 46babceea..f38a0cd1c 100644
--- a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/entity/VisitorsEntity.java
+++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/entity/VisitorsEntity.java
@@ -173,6 +173,9 @@ public class VisitorsEntity extends Model<VisitorsEntity> {
 	private Long userId;
 
 
+	@Schema(description="接待人id")
+	private Long receiveId;
+
 	@Schema(description="是否随行人员")
 	private String isOtherPeople;
 }
\ No newline at end of file
diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/VisitorsServiceImpl.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/VisitorsServiceImpl.java
index a70dd7dc1..b38c65a47 100644
--- a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/VisitorsServiceImpl.java
+++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/VisitorsServiceImpl.java
@@ -82,6 +82,7 @@ public class VisitorsServiceImpl extends ServiceImpl<VisitorsMapper, VisitorsEnt
 //            throw new ServiceException("流程实例启动失败: " + stringR.getMsg());
 //        }
 //        String processInstanceId =  stringR.getData();
+        Long userId = SecurityUtils.getUser().getId();
 
         VisitorsEntity bean = BeanUtils.toBean(visitors, VisitorsEntity.class);
         bean.setType(VisitorTypeEnum.FKSQ.getType());
@@ -91,6 +92,7 @@ public class VisitorsServiceImpl extends ServiceImpl<VisitorsMapper, VisitorsEnt
         String uniqueToken = UUID.randomUUID().toString();
         String token = uniqueToken.replace("-", "");
         bean.setToken(token);
+        bean.setUserId(userId);
         int insert = baseMapper.insert(bean);
         List<VisitorsCarAppDTO> visitorsCarAppDTOList = visitors.getCarList();
         if (!CollectionUtils.isEmpty(visitorsCarAppDTOList)){
diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/resources/mapper/VisitorsMapper.xml b/pjcloud-integrated/pjcloud-integrated-biz/src/main/resources/mapper/VisitorsMapper.xml
index 4c2b4e682..859da9c5d 100644
--- a/pjcloud-integrated/pjcloud-integrated-biz/src/main/resources/mapper/VisitorsMapper.xml
+++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/resources/mapper/VisitorsMapper.xml
@@ -30,5 +30,6 @@
         <result property="type" column="type"/>
         <result property="userId" column="user_id"/>
         <result property="isOtherPeople" column="is_other_people"/>
+        <result property="receiveId" column="receive_id"/>
   </resultMap>
 </mapper>
\ No newline at end of file