From c88d1658a2b6b51ed1a81c3be3e9102b661970f3 Mon Sep 17 00:00:00 2001 From: luoxinwu <934743099@qq.com> Date: 星期二, 05 三月 2024 09:42:37 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua --- springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WorkGuideApi.java | 8 ++++++-- 1 files changed, 6 insertions(+), 2 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 040f8cf..4b4c083 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 @@ -38,13 +38,17 @@ @ApiOperation(value = "办事指南_详情", response = ComActWorkGuideVO.class) @GetMapping("detailworkguide") - public R detailWorkGuide(@RequestParam("workGuideId") Long workGuideId, + public R detailWorkGuide(@RequestParam("workGuideId") String workGuideId, @RequestParam(value = "communityId", required = false) Long communityId) { LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin(); if (loginUserInfo != null) { communityId = loginUserInfo.getCommunityId(); } - return communityService.detailWorkGuide(workGuideId, communityId); + if(communityId==null || communityId<0) + { + return communityService.detailWorkGuide(workGuideId, ""); + } + return communityService.detailWorkGuide(workGuideId, communityId+""); } @ApiOperation(value = "办事指南列表-按分类查询", response = ComActWorkGuideAppletsVO.class) -- Gitblit v1.7.1