Merge branch 'rifka' into 'master'

cat miauw

See merge request !982

src/container/MonthlyReport/CorporateAnnualTargetMR.js

@@ -129,7 +129,7 @@ export default class CorporateAnnualTargetMR extends Component {
         api.create().getParameterByGroupName({
             "group_name": 'ACHIEVEMENT_KPI'
         }).then((response) => {
-            // console.log(response.data.data)
+            // console.log(response.data)
             if (response.data) {
                 this.setState({ parameterScore: response.data.data })
             }
@@ -1162,7 +1162,7 @@ export default class CorporateAnnualTargetMR extends Component {
             let parameterKpi = tableMeta.rowData[8]
             let parameterAch = String(tableMeta.rowData[9]).includes('%') ? `MAX${String(tableMeta.rowData[9]).substr(0, String(tableMeta.rowData[9]).length - 1)}` : String(tableMeta.rowData[9])
             let parameterMix = `${parameterKpi}_${parameterAch}`
-            let listParameterFilter = listParameter.filter((val) => val.setting_type == String(parameterMix).toLocaleUpperCase())
+            let listParameterFilter = listParameter.filter((val) => val.setting_type == String(parameterMix).toLocaleUpperCase() && String(val.company_name).toLocaleLowerCase() === "default")
             let listParameterFilterCompany = listParameterFilter.filter((val) => val.company_id == this.props.company.company_id)
             let totalScore = 0
             let achx100 = tableMeta.rowData[9] == '100%' && (tableMeta.rowData[8] == 'HIB' || tableMeta.rowData[8] == 'HIG') ? Number(tableMeta.rowData[13]) / 100 > 1 ? 1 : Number(tableMeta.rowData[13]) / 100 : Number(tableMeta.rowData[13]) / 100