Merge branch 'rifka' into 'master'

issue approval MB 22dec21

See merge request !1562

src/container/BudgetTahunan.js

@@ -229,7 +229,7 @@ export default class BudgetTahunan extends Component {
                             indexID = companyData.findIndex((val) => val.company_id == this.state.rawData.company_id)
                         }
 
-                        this.setState({ listCompany: defaultProps, company: indexID == null ? companyData[0] : companyData[indexID] }, () => {
+                        this.setState({ listCompany: defaultProps, company: indexID == null ? (this.state.company !== null ? this.state.company : companyData[0]) : companyData[indexID] }, () => {
                             // // // console.log(response.data.data);
                             if (response.data.data.length > 0) {
                                 this.getRevision()
@@ -480,7 +480,7 @@ export default class BudgetTahunan extends Component {
                     // console.log(periodeData)
                     // // // console.log(index)
                     this.setState({ listPeriode: defaultProps, periode: index === -1 ? periodeData[0] : periodeData[index] }, () => {
-                        if (this.state.isApprover === true && this.state.checkApprover == true) {
+                        if (this.state.isApprover === true) {
                             this.getCompanySubmitted()
                         } else {
                             this.getRevision()