修改bug

huanghongfa

2021-05-10 69238370f115db5d351e0ec69fc619f5730c5a01

修改bug

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

@@ -202,11 +202,11 @@
    @ApiOperation(value = "社区所有启用的党组织列表", response = PartyOrganizationVO.class)
    @PostMapping("listpartyorganization")
    public R listPartyOrganization(@RequestBody ComListPartyDTO comListPartyDTO) {
        Long communityId = this.getCommunityId();
        log.info("社区所有党组织社区id【{}】", communityId);
        if(communityId != null){
            comListPartyDTO.setCommunityId(communityId);
        }
//        Long communityId = this.getCommunityId();
//        log.info("社区所有党组织社区id【{}】", communityId);
//        if(communityId != null){
//            comListPartyDTO.setCommunityId(communityId);
//        }
        return partyBuildingService.listPartyOrganizationByApp(comListPartyDTO);
    }


 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/PartyOrganizationServiceImpl.java

@@ -162,7 +162,10 @@
    public List<PartyOrganizationVO> listPartyOrganizationByApp(ComListPartyDTO comListPartyDTO){
        List<PartyOrganizationVO> partyOrganizationVOS = new ArrayList<>();
        QueryWrapper<ComPbOrgDO> queryWrapper = new QueryWrapper<>();
        queryWrapper.lambda().eq(ComPbOrgDO::getCommunityId, comListPartyDTO.getCommunityId()).eq(ComPbOrgDO::getStatus, 1);
        queryWrapper.lambda().eq(ComPbOrgDO::getStatus, 1);
        if(comListPartyDTO.getCommunityId() != null){
            queryWrapper.lambda().eq(ComPbOrgDO::getCommunityId, comListPartyDTO.getCommunityId());
        }
        if(!StringUtils.isEmpty(comListPartyDTO.getName())){
            queryWrapper.lambda().like(ComPbOrgDO::getName,comListPartyDTO.getName());
        }