Merge branch 'release'

tuoheng-api/src/main/java/com/tuoheng/api/service/impl/WestreamSceneryServiceImpl.java

@@ -94,21 +94,16 @@ public class WestreamSceneryServiceImpl extends BaseServiceImpl<WestreamSceneryM
         if(StringUtils.isEmpty(westreamScenery.getOpenid())){
             return JsonResult.error("openid为空");
         }
-        //查询河流信息
-        Stream stream = streamMapper.selectById(westreamScenery.getStreamId());
-        if(ObjectUtil.isEmpty(stream)){
-            return JsonResult.error("河流信息为空");
+        if (null == westreamScenery.getTenantId()) {
+            return JsonResult.error("租户ID为空！");
         }
-        westreamScenery.setProvinceCode(stream.getProvinceCode());
-        westreamScenery.setCityCode(stream.getCityCode());
-        westreamScenery.setDistrictCode(stream.getDistrictCode());
-        westreamScenery.setTenantId(stream.getTenantId());
+        westreamScenery.setTenantId(westreamScenery.getTenantId());
         westreamScenery.setCreateTime(new Date());
         westreamSceneryMapper.insert(westreamScenery);
 
         //发送短信
         ThDict thDict = thDictMapper.selectOne(new LambdaQueryWrapper<ThDict>()
-                .eq(ThDict::getTenantId, stream.getTenantId())
+                .eq(ThDict::getTenantId, westreamScenery.getTenantId())
                 .eq(ThDict::getCode, DictConstants.MSG_RULE_CODE)
                 .eq(ThDict::getMark, 1));
         if(ObjectUtils.isNotNull(thDict)){