Merge branch 'test'

CeDo

2021-05-11 757e5dc619ddf01fbd9ec2c8c75b6663d79835cb

 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());
      }