Angular 按两列角度筛选客户端数组

我有客户课

export class Client {
    clientId: number;
    name: string ;
    district: string;
    province: string;
    zip: string;
    city: string;
    // tslint:disable-next-line: variable-name
    full_Address: string;
    latitude: number;
    longitude: number;
    segment: string;
    ph: string;
    bh: number;
    canal: string;
    isSimple: string;
    maxSaleDate : Date;
}

我想按列isSimple（具有value TAK或NIE）或列canal（具有value Producent或Handel）筛选客户

在这里，我单击所有输入，然后根据这些输入进行过滤

我有点被简单的过滤器过滤掉了

这是我的代码：

returnFilterSimpleValue(value : any) : string {

    switch (value == undefined) {
      case true:
          return 'NIE';
      default :
          return 'TAK';
    }

  }



const filter={
      Producent:this.checkedTypeOfClient.find(x=>x.name=="Producent").checked,
      Handel:this.checkedTypeOfClient.find(x=>x.name=="Handel").checked,
      Simple:this.checkedTypeOfClient.find(x=>x.name=="Simple").checked
   }

   let canalFilterType = this.checkedTypeOfClient.filter(x => (x.name == "Producent" && x.checked == true)
                                                        || (x.name == "Handel" && x.checked == true))
                                                        .map(y => y.name);


    let simpleFilterType = this.returnFilterSimpleValue(this.checkedTypeOfClient.find(x => x.name == 
              "Simple" && x.checked == true)) ;


     let simpleFilter = this.returnFilterSimpleValue(filter.Simple);

    this.currentClientList = this.baseClientList;

    this.currentClientList = this.currentClientList.filter(client => {
        (this.checkedSegment.includes(client.segment) && this.checkedPH.includes(client.ph))
                  && (simpleFilterType.includes(client.isSimple) && canalFilterType.includes(client.canal))

       return (this.checkedSegment.includes(client.segment) && this.checkedPH.includes(client.ph))
                      && (simpleFilterType.includes(client.isSimple) || canalFilterType.includes(client.canal)
                      );
    });