Merge remote-tracking branch 'origin/import' into import

src/main/java/org/rcisoft/sys/visit/service/impl/VisitUserServiceImpl.java

@@ -162,8 +162,10 @@ public class VisitUserServiceImpl extends ServiceImpl<VisitUserRepository, Visit
         VisitUser visitUsers = baseMapper.queryByVisitUser(visitUser);
         if (visitUsers == null)
             throw new CyServiceException(500, "您未被邀请");
-        if (!visitUsers.getUserName().equals(visitUser.getUserName()))
+        if (!visitUsers.getUserName().equals(visitUser.getUserName())){
+            visitUser.setBusinessId(visitUsers.getBusinessId());
             line = baseMapper.updateById(visitUser);
+        }
         log.debug(CyUserUtil.getAuthenUsername() + "修改了ID为" + visitUser.getBusinessId() + "的邀访访客信息表信息");
         return new CyPersistModel(line);
     }

src/main/resources/mapper/VisitUserMapper.xml

@@ -44,7 +44,7 @@
         from visit_user
         where del_flag = '0'
           and flag = '1'
-          and visit_id = #{entity.visit_id}
+          and visit_id = #{entity.visitId}
           and visit_phone = #{entity.visitPhone}
     </select>
     <delete id="deleteByVisitId">