Merge branch 'develop' of gitadmin/tuoheng_freeway into release

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/road/RoadInformationServiceImpl.java

@@ -115,14 +115,19 @@ public class RoadInformationServiceImpl extends BaseServiceImpl<RoadInformationM
         if(StringUtils.isEmpty(userId)){
             throw new ServiceException(ServiceExceptionEnum.PARAMETER_IS_NULL);
         }
+        if(StringUtils.isEmpty(CurrentUserUtil.getTenantId())){
+            throw new ServiceException(ServiceExceptionEnum.PARAMETER_IS_NULL);
+        }
         if (StringUtils.isEmpty(entity.getId())) {
             //新增
             entity.setCreateUser(userId);
             entity.setCreateTime(DateUtils.now());
+            entity.setTenantId(CurrentUserUtil.getTenantId());
         } else {
             //更新
             entity.setUpdateUser(userId);
             entity.setUpdateTime(DateUtils.now());
+            entity.setTenantId(CurrentUserUtil.getTenantId());
         }
         super.edit(entity);