Merge branch 'develop' into release

tuoheng-api/src/main/java/com/tuoheng/api/entity/request/FeedbackQuery.java

@@ -7,4 +7,9 @@ import lombok.Data;
 public class FeedbackQuery extends BaseQuery {
 
     private String openid;
+
+    /**
+     * 租户ID
+     */
+    private Integer tenantId;
 }

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

@@ -99,11 +99,15 @@ public class FeedbackServiceImpl extends BaseServiceImpl<FeedbackMapper, Feedbac
         if (StringUtils.isEmpty(query.getOpenid())) {
             return JsonResult.error("openid为空");
         }
+        if (null == query.getTenantId()) {
+            return JsonResult.error("租户ID为空！");
+        }
 
         // 获取分页数据
         IPage<Feedback> page = new Page<>(query.getPage(), query.getLimit());
         IPage<Feedback> pageData = feedbackMapper.selectPage(page, new LambdaQueryWrapper<Feedback>()
                 .eq(Feedback::getMark, 1)
+                .eq(Feedback::getTenantId, query.getTenantId())
                 .eq(Feedback::getOpenid, query.getOpenid())
                 .eq(Feedback::getType, 1)
                 .orderByDesc(Feedback::getCreateTime));

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

@@ -135,11 +135,14 @@ public class WestreamSceneryServiceImpl extends BaseServiceImpl<WestreamSceneryM
         if (StringUtils.isEmpty(query.getOpenid())) {
             return JsonResult.error("openid为空");
         }
-
+        if (null == query.getTenantId()) {
+            return JsonResult.error("租户ID为空！");
+        }
         // 获取分页数据
         IPage<WestreamScenery> page = new Page<>(query.getPage(), query.getLimit());
         IPage<WestreamScenery> pageData = westreamSceneryMapper.selectPage(page, new LambdaQueryWrapper<WestreamScenery>()
                 .eq(WestreamScenery::getMark, 1)
+                .eq(WestreamScenery::getTenantId, query.getTenantId())
                 .eq(WestreamScenery::getOpenid, query.getOpenid())
                 .orderByDesc(WestreamScenery::getCreateTime));