From 772a2589061f58549c8bbf1490fdc153bedb584a Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期二, 06 十二月 2022 15:04:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventApi.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventApi.java
index b676fe5..1cff73b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventApi.java
@@ -8,6 +8,7 @@
import com.panzhihua.common.model.dtos.community.sanshuo.ComSanshuoEventDTO;
import com.panzhihua.common.model.dtos.community.sanshuo.IndexDateDTO;
import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.service.user.UserService;
import com.panzhihua.service_community.entity.ComEvent;
import com.panzhihua.service_community.entity.ComMediateType;
import com.panzhihua.service_community.entity.ComSanshuoEvent;
@@ -38,11 +39,15 @@
@Resource
private IComEventService comEventService;
+ @Resource
+ private UserService userService;
+
@GetMapping ("/list")
public R list(@RequestParam(value = "keyWord",required = false)String keyWord,
@RequestParam(value = "page",required = false)Integer page,
@RequestParam(value = "size",required = false)Integer size){
- return commediateTypeService.listEvent(keyWord,page,size);
+ String appId=userService.detailUser(this.getUserId()).getData().getAppId();
+ return commediateTypeService.listEvent(keyWord,page,size,appId);
}
@GetMapping("/detail")
@@ -54,6 +59,8 @@
public R appletList(){
return R.ok(commediateTypeService.list(new QueryWrapper<ComMediateType>().eq("enabled",1).eq("delete_flag", 0)));
}
+
+
/**
* 新增事件类型
@@ -73,6 +80,7 @@
return commediateTypeService.addOrUpdate(comMediateTypeDTO);
}
+
/**
* 删除事件
* */
@@ -90,4 +98,6 @@
return R.ok(commediateTypeService.updateById(comMediateType));
}
+
+
}
--
Gitblit v1.7.1