Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-08-31 265efbc31da0cf910f372cc31d12a24d326e0fc0

Merge remote-tracking branch 'origin/test' into test

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WorkGuideApi.java

@@ -36,12 +36,11 @@
    @ApiOperation(value = "办事指南_详情", response = ComActWorkGuideVO.class)
    @GetMapping("detailworkguide")
    public R detailWorkGuide(@RequestParam("workGuideId") Long workGuideId,
        @RequestParam(value = "conmunityId", required = false) Long communityId) {
        Long conmunityId = communityId;
        @RequestParam(value = "communityId", required = false) Long communityId) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
        if (loginUserInfo != null) {
            conmunityId = loginUserInfo.getCommunityId();
            communityId = loginUserInfo.getCommunityId();
        }
        return communityService.detailWorkGuide(workGuideId, conmunityId);
        return communityService.detailWorkGuide(workGuideId, communityId);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/WorkGuideApi.java

@@ -44,8 +44,8 @@
    @ApiOperation(value = "办事指南_详情", response = ComActWorkGuideVO.class)
    @GetMapping("detailworkguide")
    public R detailWorkGuide(@RequestParam("workGuideId") Long workGuideId) {
        Long conmunityId = this.getLoginUserInfo().getCommunityId();
        return communityService.detailWorkGuide(workGuideId, conmunityId);
        Long communityId = this.getLoginUserInfo().getCommunityId();
        return communityService.detailWorkGuide(workGuideId, communityId);
    }

    @ApiOperation(value = "办事指南_分页", response = ComActWorkGuideVO.class)

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -2942,7 +2942,7 @@
     * @return 详情
     */
    @GetMapping("/detailworkguide")
    R detailWorkGuide(@RequestParam("workGuideId") Long workGuideId, @RequestParam("conmunityId") Long conmunityId);
    R detailWorkGuide(@RequestParam("workGuideId") Long workGuideId, @RequestParam("communityId") Long communityId);

    /**
     * 办事指南_分页

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/WorkGuideApi.java

@@ -57,8 +57,8 @@
     */
    @GetMapping("detailworkguide")
    public R detailWorkGuide(@RequestParam("workGuideId") Long workGuideId,
        @RequestParam("conmunityId") Long conmunityId) {
        return workGuideService.detailWorkGuide(workGuideId, conmunityId);
        @RequestParam("communityId") Long communityId) {
        return workGuideService.detailWorkGuide(workGuideId, communityId);
    }

    /**

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWorkGuideServiceImpl.java

@@ -104,14 +104,14 @@
    }

    @Override
    public R detailWorkGuide(Long workGuideId, Long conmunityId) {
    public R detailWorkGuide(Long workGuideId, Long communityId) {
        ComActWorkGuideDO workGuideDO = this.baseMapper.selectById(workGuideId);
        if (workGuideDO == null) {
            return R.fail("Id有误！");
        }
        ComActWorkGuideVO vo = new ComActWorkGuideVO();
        BeanUtils.copyProperties(workGuideDO, vo);
        ComActDO comActDO = comActDAO.selectById(conmunityId);
        ComActDO comActDO = comActDAO.selectById(communityId);
        if (comActDO != null) {
            vo.setAddress(comActDO.getAddress());
            vo.setPhone(comActDO.getContactsPhone());

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java

@@ -550,7 +550,7 @@
        try {
            // 查询社区信息
            log.info("开始查询社区信息数据");
            ComPopulationActVO populationActVO = comActDAO.getPopulationActById(31L);
            ComPopulationActVO populationActVO = comActDAO.getPopulationActById(communityId);
            if (populationActVO == null) {
                log.error("未查询到社区信息");
                return R.fail("未查询到社区信息");
@@ -560,7 +560,7 @@
            // 查询当前社区标签列表
            List<String> labelList = new ArrayList<>();
            List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO
                .selectList(new QueryWrapper<ComMngUserTagDO>().eq("sys_flag", 1).or().eq("community_id", 31));
                .selectList(new QueryWrapper<ComMngUserTagDO>().eq("sys_flag", 1).or().eq("community_id", communityId));
            if (!ObjectUtils.isEmpty(comMngUserTagDOS)) {
                labelList = comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName())
                    .collect(Collectors.toList());
@@ -632,7 +632,7 @@
                log.info("开始查询小区街路巷是否存在");
                // 查询小区街路巷是否存在
                ComMngVillageDO comMngVillageDO = null;
                String villageKey = 31 + vo.getRoad() + vo.getDoorNo();
                String villageKey = communityId + vo.getRoad() + vo.getDoorNo();
                if (!isOnly(villageKey, villageMap)) {
                    comMngVillageDO = (ComMngVillageDO)villageMap.get(villageKey);
                } else {