From 20be31f2cbfab45fdae0fa8c6b887c5ecd6e30b4 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期五, 08 三月 2024 14:22:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncVisitServiceImpl.java |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncVisitServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncVisitServiceImpl.java
index 91ef13b..1b07b30 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncVisitServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncVisitServiceImpl.java
@@ -383,12 +383,14 @@
         request.setVisitStartTime(DateUtil.getISO8601Timestamp(c.getStarttime()));
         request.setVisitEndTime(DateUtil.getISO8601Timestamp(c.getEndtime()));
         request.setReceptionistId(c.getReceptMemberHkId());//琚浜烘捣搴风紪鐮�
-        request.setVisitPurpose(c.getReason());
+
         if(StringUtils.isNotBlank(c.getReason())){
             char[] charArray = c.getReason().toCharArray();
             int length = charArray.length;
             if(length>32){
-                request.setVisitPurpose(c.getReason().substring(32));
+                request.setVisitPurpose(c.getReason().substring(0,32));
+            }else{
+                request.setVisitPurpose(c.getReason());
             }
         }
         //鑾峰彇鏉冮檺缁勯泦鍚�
@@ -414,7 +416,15 @@
             return  null;
         }
         info.setVisitorName(c.getName());
-        info.setVisitorWorkUnit(c.getCompanyName());
+        if(StringUtils.isNotBlank(c.getCompanyName())){
+            char[] charArray = c.getCompanyName().toCharArray();
+            int length = charArray.length;
+            if(length>32){
+                info.setVisitorWorkUnit(c.getCompanyName().substring(0,32));
+            }else{
+                info.setVisitorWorkUnit(c.getCompanyName());
+            }
+        }
         info.setPhoneNo(c.getPhone());
         info.setPlateNo(c.getCarNos());
         info.setGender(c.getSex()+"");

--
Gitblit v1.9.3