101captain
2022-04-28 0cf2d51fd7b0f67c34d93d933dd367a87a4aaced
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java
@@ -79,18 +79,18 @@
     */
    @Override
    public R pageNeighborByApp(ComActNeighborCircleAppDTO neighborCircleAppDTO) {
        if(neighborCircleAppDTO.getCommunityId()==0L){
            R<LoginUserInfoVO> loginUserInfoVOR=userService.getUserInfoByUserId(neighborCircleAppDTO.getUserId().toString());
            if(R.isOk(loginUserInfoVOR)){
                LoginUserInfoVO loginUserInfoVO=loginUserInfoVOR.getData();
                if(loginUserInfoVO!=null){
                 ComPbMemberDO comPbMemberDO=comPbMemberDAO.selectOne(new QueryWrapper<ComPbMemberDO>().lambda().eq(ComPbMemberDO::getIdCard,loginUserInfoVO.getIdCard()));
                 if(comPbMemberDO!=null){
                     neighborCircleAppDTO.setCommunityId(comPbMemberDO.getCommunityId());
                 }
                }
            }
        }
//        if(neighborCircleAppDTO.getCommunityId()==0L){
//            R<LoginUserInfoVO> loginUserInfoVOR=userService.getUserInfoByUserId(neighborCircleAppDTO.getUserId().toString());
//            if(R.isOk(loginUserInfoVOR)){
//                LoginUserInfoVO loginUserInfoVO=loginUserInfoVOR.getData();
//                if(loginUserInfoVO!=null){
//                 ComPbMemberDO comPbMemberDO=comPbMemberDAO.selectOne(new QueryWrapper<ComPbMemberDO>().lambda().eq(ComPbMemberDO::getIdCard,loginUserInfoVO.getIdCard()));
//                 if(comPbMemberDO!=null){
//                     neighborCircleAppDTO.setCommunityId(comPbMemberDO.getCommunityId());
//                 }
//                }
//            }
//        }
        Page userPage = new Page(neighborCircleAppDTO.getPageNum(), neighborCircleAppDTO.getPageSize());
        IPage<ComActNeighborCircleAppVO> doPager = this.baseMapper.pageNeighborByApp(userPage, neighborCircleAppDTO);
        if (!doPager.getRecords().isEmpty()) {