From 8e2d30fd6ac9c8cd3ee6d68c8fd575848f37390d Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期二, 31 八月 2021 10:42:13 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WorkGuideApi.java | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WorkGuideApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WorkGuideApi.java
index 10fd9f5..1476310 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WorkGuideApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WorkGuideApi.java
@@ -1,15 +1,19 @@
package com.panzhihua.applets.api;
+import javax.annotation.Resource;
+
+import org.springframework.web.bind.annotation.*;
+
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.PageActWorkGuideDTO;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActWorkGuideVO;
import com.panzhihua.common.service.community.CommunityService;
+
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
/**
* @auther llming
@@ -23,17 +27,20 @@
@Resource
private CommunityService communityService;
- @ApiOperation(value = "办事指南_分页",response = ComActWorkGuideVO.class)
+ @ApiOperation(value = "办事指南_分页", response = ComActWorkGuideVO.class)
@PostMapping("pageworkguide")
public R detailWorkGuide(@RequestBody PageActWorkGuideDTO pageActWorkGuideDTO) {
return communityService.pageWorkGuide(pageActWorkGuideDTO);
}
- @ApiOperation(value = "办事指南_详情",response = ComActWorkGuideVO.class)
+ @ApiOperation(value = "办事指南_详情", response = ComActWorkGuideVO.class)
@GetMapping("detailworkguide")
- public R detailWorkGuide(@RequestParam("workGuideId")Long workGuideId) {
- Long conmunityId = this.getLoginUserInfo().getCommunityId();
- return communityService.detailWorkGuide(workGuideId, conmunityId);
+ public R detailWorkGuide(@RequestParam("workGuideId") Long workGuideId,
+ @RequestParam(value = "communityId", required = false) Long communityId) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if (loginUserInfo != null) {
+ communityId = loginUserInfo.getCommunityId();
+ }
+ return communityService.detailWorkGuide(workGuideId, communityId);
}
}
-
--
Gitblit v1.7.1