diff --git a/src/views/Master/MasterRoles/DialogForm.js b/src/views/Master/MasterRoles/DialogForm.js
index 966c5ee..fab37b4 100644
--- a/src/views/Master/MasterRoles/DialogForm.js
+++ b/src/views/Master/MasterRoles/DialogForm.js
@@ -5,7 +5,7 @@ import 'antd/dist/antd.css';
 import { withTranslation } from 'react-i18next';
 import axios from 'axios';
 import { Select } from 'antd';
-import { MENU_COMPANY_SEARCH, MENU_SEARCH } from '../../../const/ApiConst.js';
+import { MENU_SEARCH } from '../../../const/ApiConst.js';
 
 const { Option } = Select
 const token = window.localStorage.getItem('token');
@@ -18,7 +18,6 @@ const config = {
   }
 };
 
-
 class DialogForm extends Component {
   constructor(props) {
     super(props)
@@ -30,6 +29,7 @@ class DialogForm extends Component {
       isParentClick: false,
       menu: [],
       selectedMenu: null,
+      company_id
     }
   }
 
@@ -61,60 +61,21 @@ class DialogForm extends Component {
   }
 
   getAllMenu = async () => {
-    const { companyID } = this.props;
-    const { roleName } = this.props;
-    if (roleName !== "Super Admin") {
-      const payload = {
-        "paging": {
-          "start": 0,
-          "length": -1
-        },
-        "columns": [{
-          "name": "company_id",
-          "logic_operator": "=",
-          "value": companyID,
-          "operator": "AND"
-        }],
-        "joins": [{
-          "name": "m_menu",
-          "column_join": "menu_id",
-          "column_results": [
-            "name"
-          ]
-        }],
-        "orders": { "columns": ["id"], "ascending": false }
-      }
-      const result = await axios
-        .post(MENU_COMPANY_SEARCH, payload, config)
-        .then(res => res)
-        .catch((error) => error.response);
-      if (result && result.data && result.data.code == 200) {
-        this.setState({ menu: result.data.data });
-      }
-
-    } else {
-      const payload = {
-        "paging": {
-          "start": 0,
-          "length": -1
-        },
-        "columns": [{
-          "name": "name",
-          "logic_operator": "ilike",
-          "value": "",
-          "operator": "AND"
-        }],
-        "orders": { "columns": ["id"], "ascending": false }
-      }
-      const result = await axios
-        .post(MENU_SEARCH, payload, config)
-        .then(res => res)
-        .catch((error) => error.response);
-      if (result && result.data && result.data.code == 200) {
-        this.setState({ menu: result.data.data });
-      }
+    const payload = {
+      "paging": { "start": 0, "length": -1 },
+      "columns": [
+        { "name": "name", "logic_operator": "ilike", "value": "", "operator": "AND" }
+      ],
+      "joins": [],
+      "orders": { "columns": ["id"], "ascending": false }
+    }
+    const result = await axios
+      .post(MENU_SEARCH, payload, config)
+      .then(res => res)
+      .catch((error) => error.response);
+    if (result && result.data && result.data.code == 200) {
+      this.setState({ menu: result.data.data });
     }
-
   }
 
   showDialog = () => {
@@ -133,13 +94,12 @@ class DialogForm extends Component {
   }
 
   handleSave = () => {
-    const { companyID } = this.props;
     const {
       id,
       name,
       description,
       selectedMenu,
-
+      company_id
     } = this.state
 
     let data = '';
@@ -151,7 +111,7 @@ class DialogForm extends Component {
           name,
           description,
           selectedMenu,
-          company_id: companyID
+          company_id
         }
         // console.log('data', data);
         this.props.closeDialog('save', data);
@@ -161,7 +121,7 @@ class DialogForm extends Component {
           name,
           description,
           selectedMenu,
-          company_id: companyID
+          company_id
         }
         this.props.closeDialog('edit', data);
       }
@@ -206,7 +166,7 @@ class DialogForm extends Component {
                 }}>
                 {this.state.menu.map((item) => (
                   <option key={item.id} value={item.id}>
-                    {item.name ?? item.join_first_name}
+                    {item.name}
                   </option>
                 ))}
               </Input>
diff --git a/src/views/Master/MasterRoles/DialogMenuRoles.js b/src/views/Master/MasterRoles/DialogMenuRoles.js
index 6826a8b..cec1b42 100644
--- a/src/views/Master/MasterRoles/DialogMenuRoles.js
+++ b/src/views/Master/MasterRoles/DialogMenuRoles.js
@@ -3,8 +3,9 @@ import { Modal, ModalHeader, ModalBody, ModalFooter, Row, Col, Table } from 'rea
 import { Button, Form, FormGroup, Label, Input } from 'reactstrap';
 import 'antd/dist/antd.css';
 import axios from 'axios';
-import { MENU_COMPANY_SEARCH, MENU_SEARCH } from '../../../const/ApiConst.js';
+import { MENU_SEARCH } from '../../../const/ApiConst.js';
 import { withTranslation, WithTranslation } from 'react-i18next';
+const BASE_URL = "http://siopas.co.id/custom-php/api/geohr/";
 
 const token = window.localStorage.getItem('token');
 
@@ -51,61 +52,30 @@ class DialogMenuRoles extends Component {
   }
 
   getAllMenu = async () => {
-    const { companyID } = this.props;
-    const { roleName } = this.props;
-    if (roleName !== "Super Admin") {
-      const payload = {
-        "paging": {
-          "start": 0,
-          "length": -1
-        },
-        "columns": [{
-          "name": "company_id",
-          "logic_operator": "=",
-          "value": companyID,
-          "operator": "AND"
-        }],
-        "joins": [{
-          "name": "m_menu",
-          "column_join": "menu_id",
-          "column_results": [
-            "name"
-          ]
-        }],
-        "orders": { "columns": ["id"], "ascending": false }
-      }
-      const result = await axios
-        .post(MENU_COMPANY_SEARCH, payload, config)
-        .then(res => res)
-        .catch((error) => error.response);
-      if (result && result.data && result.data.code == 200) {
-        this.setState({ menu: result.data.data }, () => {
-          this.setStateMenu(false);
-        });
-      } else {
-      }
+    const payload = {
+      "paging": { "start": 0, "length": -1 },
+      "columns": [
+        { "name": "name", "logic_operator": "ilike", "value": "", "operator": "AND" }
+      ],
+      "joins": [],
+      "orders": { "columns": ["id"], "ascending": false }
+    }
+
+
+
+    const result = await axios
+      .post(MENU_SEARCH, payload, config)
+      .then(res => res)
+      .catch((error) => error.response);
+
+
+    if (result && result.data && result.data.code == 200) {
+      this.setState({ menu: result.data.data }, () => {
+        this.setStateMenu(false);
+      });
     } else {
-      const payload = {
-        "paging": {
-          "start": 0,
-          "length": -1
-        },
-        "columns": [{
-          "name": "name",
-          "logic_operator": "ilike",
-          "value": "",
-          "operator": "AND"
-        }],
-        "orders": { "columns": ["id"], "ascending": false }
-      }
-      const result = await axios
-        .post(MENU_SEARCH, payload, config)
-        .then(res => res)
-        .catch((error) => error.response);
-      if (result && result.data && result.data.code == 200) {
-        this.setState({ menu: result.data.data });
-      }
     }
+
   }
 
   setStateMenu = edit => {
@@ -126,14 +96,13 @@ class DialogMenuRoles extends Component {
     let copyStateMenu = [...this.state.stateMenu];
     this.props.menuRoles.map((val, indexMenu) => {
       let index = this.getIndexDataMenu(val.menu_id);
-      console.log('index true', index);
+      console.log("index true", val.menu_id);
       if (index >= 0) {
         copyStateMenu[index] = true;
       }
     })
     this.setState({ stateMenu: [] }, () => {
       let check = copyStateMenu.some(this.checkArray);
-      console.log('icheck', check);
       if (check === false) {
         this.setState({ allChecked: true, stateMenu: copyStateMenu })
       } else {
@@ -182,12 +151,11 @@ class DialogMenuRoles extends Component {
 
   renderForm = () => {
     const { menu, stateMenu } = this.state
-    console.log('stateMenu', stateMenu);
     return (
       menu.map((val, index) => {
         return (
           <tr key={index}>
-            <td>{val.join_first_name ?? val.name}</td>
+            <td>{val.name}</td>
             <td><input type="checkbox" onClick={(e) => this.handleChangeCheckbox(e.target.checked, index)} defaultChecked={stateMenu[index]} /></td>
           </tr>
         )