diff --git a/.eslintrc.js b/.eslintrc.js
index cd6da0a..8b0438b 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -24,7 +24,7 @@ module.exports = {
       2,
       {
         optionalDependencies: true,
-        devDependencies: ['**/tests/**.js', '/mock/**.js', '**/**.test.js'],
+        devDependencies: ['**/tests/**.js', '/mock/**/**.js', '**/**.test.js'],
       },
     ],
     'jsx-a11y/no-noninteractive-element-interactions': 0,
@@ -33,8 +33,9 @@ module.exports = {
     'jsx-a11y/anchor-is-valid': 0,
     'no-nested-ternary': 0,
     'linebreak-style': 0,
+    'camelcase': 1,
   },
   settings: {
-    polyfills: ['fetch', 'promises', 'url'],
+    polyfills: ['fetch', 'promises', 'url', 'object-assign'],
   },
 };
diff --git a/src/defaultSettings.js b/src/defaultSettings.js
index 6e98a77..6714cbe 100644
--- a/src/defaultSettings.js
+++ b/src/defaultSettings.js
@@ -1,4 +1,6 @@
 module.exports = {
+  title: 'Sword企业级开发平台',
+  tenantMode: true, // 开启租户模式
   navTheme: 'dark', // theme for nav menu
   primaryColor: '#1890FF', // primary color of ant design
   layout: 'sidemenu', // nav menu position: sidemenu or topmenu
@@ -10,6 +12,5 @@ module.exports = {
   menu: {
     disableLocal: false,
   },
-  title: 'Sword企业级开发平台',
   pwa: true,
 };
diff --git a/src/pages/Login/Login.js b/src/pages/Login/Login.js
index 9652781..96a19dc 100644
--- a/src/pages/Login/Login.js
+++ b/src/pages/Login/Login.js
@@ -4,6 +4,7 @@ import { formatMessage, FormattedMessage } from 'umi/locale';
 import { Checkbox, Alert } from 'antd';
 import Login from '../../components/Login';
 import styles from './Login.less';
+import { tenantMode } from '../../defaultSettings';
 
 const { Tab, TenantCode, UserName, Password, Submit } = Login;
 
@@ -80,16 +81,18 @@ class LoginPage extends Component {
               login.type === 'account' &&
               !submitting &&
               this.renderMessage(formatMessage({ id: 'app.login.message-invalid-credentials' }))}
-            <TenantCode
-              name="tenantCode"
-              placeholder={`${formatMessage({ id: 'app.login.tenantCode' })}: 000000`}
-              rules={[
-                {
-                  required: true,
-                  message: formatMessage({ id: 'validation.tenantCode.required' }),
-                },
-              ]}
-            />
+            {tenantMode ? (
+              <TenantCode
+                name="tenantCode"
+                placeholder={`${formatMessage({ id: 'app.login.tenantCode' })}: 000000`}
+                rules={[
+                  {
+                    required: true,
+                    message: formatMessage({ id: 'validation.tenantCode.required' }),
+                  },
+                ]}
+              />
+            ) : null}
             <UserName
               name="account"
               placeholder={`${formatMessage({ id: 'app.login.userName' })}: admin`}
diff --git a/src/pages/System/Dept/Dept.js b/src/pages/System/Dept/Dept.js
index 4cdd327..f859afd 100644
--- a/src/pages/System/Dept/Dept.js
+++ b/src/pages/System/Dept/Dept.js
@@ -4,6 +4,7 @@ import { Button, Col, Form, Input, Row } from 'antd';
 import Panel from '../../../components/Panel';
 import Grid from '../../../components/Sword/Grid';
 import { DEPT_LIST } from '../../../actions/dept';
+import { tenantMode } from '../../../defaultSettings';
 
 const FormItem = Form.Item;
 
@@ -65,14 +66,14 @@ class Dept extends PureComponent {
     } = this.props;
 
     const columns = [
-      {
-        title: '部门名称',
-        dataIndex: 'deptName',
-      },
       {
         title: '租户编号',
         dataIndex: 'tenantCode',
       },
+      {
+        title: '部门名称',
+        dataIndex: 'deptName',
+      },
       {
         title: '部门全称',
         dataIndex: 'fullName',
@@ -83,6 +84,10 @@ class Dept extends PureComponent {
       },
     ];
 
+    if (!tenantMode) {
+      columns.splice(0, 1);
+    }
+
     return (
       <Panel>
         <Grid
diff --git a/src/pages/System/Dept/DeptAdd.js b/src/pages/System/Dept/DeptAdd.js
index be782d6..94f10f8 100644
--- a/src/pages/System/Dept/DeptAdd.js
+++ b/src/pages/System/Dept/DeptAdd.js
@@ -35,7 +35,6 @@ class DeptAdd extends PureComponent {
     const { dispatch, form } = this.props;
     form.validateFieldsAndScroll((err, values) => {
       if (!err) {
-        console.log(values);
         dispatch(DEPT_SUBMIT(values));
       }
     });
diff --git a/src/pages/System/Dept/DeptEdit.js b/src/pages/System/Dept/DeptEdit.js
index 2bd9c9c..92a2994 100644
--- a/src/pages/System/Dept/DeptEdit.js
+++ b/src/pages/System/Dept/DeptEdit.js
@@ -1,5 +1,5 @@
 import React, { PureComponent } from 'react';
-import { Form, Input, Card, Row, Col, Button, InputNumber, TreeSelect } from 'antd';
+import { Form, Input, Card, Row, Col, Button, InputNumber, TreeSelect, message } from "antd";
 import { connect } from 'dva';
 import Panel from '../../../components/Panel';
 import styles from '../../../layouts/Sword.less';
@@ -34,13 +34,17 @@ class DeptEdit extends PureComponent {
       },
       form,
     } = this.props;
+    const parentId = form.getFieldValue('parentId');
+    if (id === parentId.toString()) {
+      message.warn('上级部门不能选择自身!');
+      return;
+    }
     form.validateFieldsAndScroll((err, values) => {
       if (!err) {
         const params = {
           id,
           ...values,
         };
-        console.log(params);
         dispatch(DEPT_SUBMIT(params));
       }
     });
diff --git a/src/pages/System/Dict/DictAdd.js b/src/pages/System/Dict/DictAdd.js
index 6bffbc9..d06b4a7 100644
--- a/src/pages/System/Dict/DictAdd.js
+++ b/src/pages/System/Dict/DictAdd.js
@@ -40,7 +40,6 @@ class DictAdd extends PureComponent {
     const { dispatch, form } = this.props;
     form.validateFieldsAndScroll((err, values) => {
       if (!err) {
-        console.log(values);
         dispatch(DICT_SUBMIT(values));
       }
     });
diff --git a/src/pages/System/Dict/DictEdit.js b/src/pages/System/Dict/DictEdit.js
index ff32e15..1ac24a1 100644
--- a/src/pages/System/Dict/DictEdit.js
+++ b/src/pages/System/Dict/DictEdit.js
@@ -1,5 +1,5 @@
 import React, { PureComponent } from 'react';
-import { Form, Input, Card, Row, Col, Button, InputNumber, TreeSelect } from 'antd';
+import { Form, Input, Card, Row, Col, Button, InputNumber, TreeSelect, message } from "antd";
 import { connect } from 'dva';
 import Panel from '../../../components/Panel';
 import styles from '../../../layouts/Sword.less';
@@ -39,13 +39,17 @@ class DictEdit extends PureComponent {
       },
       form,
     } = this.props;
+    const parentId = form.getFieldValue('parentId');
+    if (id === parentId.toString()) {
+      message.warn('上级字典不能选择自身!');
+      return;
+    }
     form.validateFieldsAndScroll((err, values) => {
       if (!err) {
         const params = {
           id,
           ...values,
         };
-        console.log(params);
         dispatch(DICT_SUBMIT(params));
       }
     });
diff --git a/src/pages/System/Menu/MenuAdd.js b/src/pages/System/Menu/MenuAdd.js
index 0367456..9a37b64 100644
--- a/src/pages/System/Menu/MenuAdd.js
+++ b/src/pages/System/Menu/MenuAdd.js
@@ -51,7 +51,6 @@ class MenuAdd extends PureComponent {
     const { dispatch, form } = this.props;
     form.validateFieldsAndScroll((err, values) => {
       if (!err) {
-        console.log(values);
         dispatch(MENU_SUBMIT(values));
       }
     });
diff --git a/src/pages/System/Menu/MenuEdit.js b/src/pages/System/Menu/MenuEdit.js
index 19cf364..f8a2c1b 100644
--- a/src/pages/System/Menu/MenuEdit.js
+++ b/src/pages/System/Menu/MenuEdit.js
@@ -11,6 +11,7 @@ import {
   Radio,
   Icon,
   Modal,
+  message,
 } from 'antd';
 import { connect } from 'dva';
 import Panel from '../../../components/Panel';
@@ -51,13 +52,17 @@ class MenuEdit extends PureComponent {
       },
       form,
     } = this.props;
+    const parentId = form.getFieldValue('parentId');
+    if (id === parentId.toString()) {
+      message.warn('上级菜单不能选择自身!');
+      return;
+    }
     form.validateFieldsAndScroll((err, values) => {
       if (!err) {
         const params = {
           id,
           ...values,
         };
-        console.log(params);
         dispatch(MENU_SUBMIT(params));
       }
     });
diff --git a/src/pages/System/Role/Role.js b/src/pages/System/Role/Role.js
index d8f4406..82ecc51 100644
--- a/src/pages/System/Role/Role.js
+++ b/src/pages/System/Role/Role.js
@@ -11,6 +11,7 @@ import {
   ROLE_GRANT,
 } from '../../../actions/role';
 import { MENU_REFRESH_DATA } from '../../../actions/menu';
+import { tenantMode } from '../../../defaultSettings';
 
 const FormItem = Form.Item;
 const { TreeNode } = Tree;
@@ -176,14 +177,14 @@ class Role extends PureComponent {
     } = this.props;
 
     const columns = [
-      {
-        title: '角色名称',
-        dataIndex: 'roleName',
-      },
       {
         title: '租户编号',
         dataIndex: 'tenantCode',
       },
+      {
+        title: '角色名称',
+        dataIndex: 'roleName',
+      },
       {
         title: '角色别名',
         dataIndex: 'roleAlias',
@@ -194,6 +195,10 @@ class Role extends PureComponent {
       },
     ];
 
+    if (!tenantMode) {
+      columns.splice(0, 1);
+    }
+
     return (
       <Panel>
         <Grid
diff --git a/src/pages/System/Role/RoleAdd.js b/src/pages/System/Role/RoleAdd.js
index 5151b37..cf03c88 100644
--- a/src/pages/System/Role/RoleAdd.js
+++ b/src/pages/System/Role/RoleAdd.js
@@ -35,7 +35,6 @@ class RoleAdd extends PureComponent {
     const { dispatch, form } = this.props;
     form.validateFieldsAndScroll((err, values) => {
       if (!err) {
-        console.log(values);
         dispatch(ROLE_SUBMIT(values));
       }
     });
diff --git a/src/pages/System/Role/RoleEdit.js b/src/pages/System/Role/RoleEdit.js
index 224f869..f931e6e 100644
--- a/src/pages/System/Role/RoleEdit.js
+++ b/src/pages/System/Role/RoleEdit.js
@@ -1,5 +1,5 @@
 import React, { PureComponent } from 'react';
-import { Form, Input, Card, Row, Col, Button, InputNumber, TreeSelect } from 'antd';
+import { Form, Input, Card, Row, Col, Button, InputNumber, TreeSelect, message } from "antd";
 import { connect } from 'dva';
 import Panel from '../../../components/Panel';
 import styles from '../../../layouts/Sword.less';
@@ -34,13 +34,17 @@ class RoleEdit extends PureComponent {
       },
       form,
     } = this.props;
+    const parentId = form.getFieldValue('parentId');
+    if (id === parentId.toString()) {
+      message.warn('上级角色不能选择自身!');
+      return;
+    }
     form.validateFieldsAndScroll((err, values) => {
       if (!err) {
         const params = {
           id,
           ...values,
         };
-        console.log(params);
         dispatch(ROLE_SUBMIT(params));
       }
     });
diff --git a/src/pages/System/User/User.js b/src/pages/System/User/User.js
index 23dc44c..ae97c09 100644
--- a/src/pages/System/User/User.js
+++ b/src/pages/System/User/User.js
@@ -5,6 +5,7 @@ import Panel from '../../../components/Panel';
 import Grid from '../../../components/Sword/Grid';
 import { USER_INIT, USER_LIST, USER_ROLE_GRANT } from '../../../actions/user';
 import { resetPassword } from '../../../services/user';
+import { tenantMode } from '../../../defaultSettings';
 
 const FormItem = Form.Item;
 const { TreeNode } = Tree;
@@ -211,6 +212,10 @@ class User extends PureComponent {
       },
     ];
 
+    if (!tenantMode) {
+      columns.splice(0, 1);
+    }
+
     return (
       <Panel>
         <Grid
diff --git a/src/pages/System/User/UserAdd.js b/src/pages/System/User/UserAdd.js
index 189461c..6728ff5 100644
--- a/src/pages/System/User/UserAdd.js
+++ b/src/pages/System/User/UserAdd.js
@@ -6,6 +6,7 @@ import Panel from '../../../components/Panel';
 import styles from '../../../layouts/Sword.less';
 import { USER_INIT, USER_CHANGE_INIT, USER_SUBMIT } from '../../../actions/user';
 import func from '../../../utils/Func';
+import { tenantMode } from '../../../defaultSettings';
 
 const FormItem = Form.Item;
 
@@ -66,6 +67,15 @@ class UserAdd extends PureComponent {
       },
     };
 
+    const formAllItemLayout = {
+      labelCol: {
+        span: 4,
+      },
+      wrapperCol: {
+        span: 20,
+      },
+    };
+
     const action = (
       <Button type="primary" onClick={this.handleSubmit} loading={submitting}>
         提交
@@ -77,8 +87,8 @@ class UserAdd extends PureComponent {
         <Form hideRequiredMark style={{ marginTop: 8 }}>
           <Card title="基本信息" className={styles.card} bordered={false}>
             <Row gutter={24}>
-              <Col span={10}>
-                <FormItem {...formItemLayout} label="登录账号">
+              <Col span={20}>
+                <FormItem {...formAllItemLayout} label="登录账号">
                   {getFieldDecorator('account', {
                     rules: [
                       {
@@ -89,35 +99,39 @@ class UserAdd extends PureComponent {
                   })(<Input placeholder="请输入登录账号" />)}
                 </FormItem>
               </Col>
-              <Col span={10}>
-                <FormItem {...formItemLayout} label="所属租户">
-                  {getFieldDecorator('tenantCode', {
-                    rules: [
-                      {
-                        required: true,
-                        message: '请选择所属租户',
-                      },
-                    ],
-                  })(
-                    <Select
-                      showSearch
-                      onChange={this.handleChange}
-                      filterOption={(input, option) =>
-                        option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
-                      }
-                      allowClear
-                      placeholder="请选择所属租户"
-                    >
-                      {tenantList.map(d => (
-                        <Select.Option key={d.tenantCode} value={d.tenantCode}>
-                          {d.tenantName}
-                        </Select.Option>
-                      ))}
-                    </Select>
-                  )}
-                </FormItem>
-              </Col>
             </Row>
+            {tenantMode ? (
+              <Row gutter={24}>
+                <Col span={20}>
+                  <FormItem {...formAllItemLayout} label="所属租户">
+                    {getFieldDecorator('tenantCode', {
+                      rules: [
+                        {
+                          required: true,
+                          message: '请选择所属租户',
+                        },
+                      ],
+                    })(
+                      <Select
+                        showSearch
+                        onChange={this.handleChange}
+                        filterOption={(input, option) =>
+                          option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
+                        }
+                        allowClear
+                        placeholder="请选择所属租户"
+                      >
+                        {tenantList.map(d => (
+                          <Select.Option key={d.tenantCode} value={d.tenantCode}>
+                            {d.tenantName}
+                          </Select.Option>
+                        ))}
+                      </Select>
+                    )}
+                  </FormItem>
+                </Col>
+              </Row>
+            ) : null}
             <Row gutter={24}>
               <Col span={10}>
                 <FormItem {...formItemLayout} label="密码">
diff --git a/src/pages/System/User/UserEdit.js b/src/pages/System/User/UserEdit.js
index 7e7b12d..5591d3f 100644
--- a/src/pages/System/User/UserEdit.js
+++ b/src/pages/System/User/UserEdit.js
@@ -6,6 +6,7 @@ import Panel from '../../../components/Panel';
 import func from '../../../utils/Func';
 import styles from '../../../layouts/Sword.less';
 import { USER_CHANGE_INIT, USER_DETAIL, USER_INIT, USER_SUBMIT } from '../../../actions/user';
+import { tenantMode } from '../../../defaultSettings';
 
 const FormItem = Form.Item;
 
@@ -65,8 +66,6 @@ class UserEdit extends PureComponent {
       submitting,
     } = this.props;
 
-    console.log(detail);
-
     const formItemLayout = {
       labelCol: {
         span: 8,
@@ -76,6 +75,15 @@ class UserEdit extends PureComponent {
       },
     };
 
+    const formAllItemLayout = {
+      labelCol: {
+        span: 4,
+      },
+      wrapperCol: {
+        span: 20,
+      },
+    };
+
     const action = (
       <Button type="primary" onClick={this.handleSubmit} loading={submitting}>
         提交
@@ -87,8 +95,8 @@ class UserEdit extends PureComponent {
         <Form hideRequiredMark style={{ marginTop: 8 }}>
           <Card title="基本信息" className={styles.card} bordered={false}>
             <Row gutter={24}>
-              <Col span={10}>
-                <FormItem {...formItemLayout} label="登录账号">
+              <Col span={20}>
+                <FormItem {...formAllItemLayout} label="登录账号">
                   {getFieldDecorator('account', {
                     rules: [
                       {
@@ -100,36 +108,40 @@ class UserEdit extends PureComponent {
                   })(<Input placeholder="请输入登录账号" />)}
                 </FormItem>
               </Col>
-              <Col span={10}>
-                <FormItem {...formItemLayout} label="所属租户">
-                  {getFieldDecorator('tenantCode', {
-                    rules: [
-                      {
-                        required: true,
-                        message: '请选择所属租户',
-                      },
-                    ],
-                    initialValue: detail.tenantCode,
-                  })(
-                    <Select
-                      showSearch
-                      onChange={this.handleChange}
-                      filterOption={(input, option) =>
-                        option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
-                      }
-                      allowClear
-                      placeholder="请选择所属租户"
-                    >
-                      {tenantList.map(d => (
-                        <Select.Option key={d.tenantCode} value={d.tenantCode}>
-                          {d.tenantName}
-                        </Select.Option>
-                      ))}
-                    </Select>
-                  )}
-                </FormItem>
-              </Col>
             </Row>
+            {tenantMode ? (
+              <Row gutter={24}>
+                <Col span={20}>
+                  <FormItem {...formAllItemLayout} label="所属租户">
+                    {getFieldDecorator('tenantCode', {
+                      rules: [
+                        {
+                          required: true,
+                          message: '请选择所属租户',
+                        },
+                      ],
+                      initialValue: detail.tenantCode,
+                    })(
+                      <Select
+                        showSearch
+                        onChange={this.handleChange}
+                        filterOption={(input, option) =>
+                          option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
+                        }
+                        allowClear
+                        placeholder="请选择所属租户"
+                      >
+                        {tenantList.map(d => (
+                          <Select.Option key={d.tenantCode} value={d.tenantCode}>
+                            {d.tenantName}
+                          </Select.Option>
+                        ))}
+                      </Select>
+                    )}
+                  </FormItem>
+                </Col>
+              </Row>
+            ) : null}
             <Row gutter={24}>
               <Col span={10}>
                 <FormItem {...formItemLayout} label="用户昵称">
diff --git a/src/pages/System/User/UserView.js b/src/pages/System/User/UserView.js
index af490d0..0b46c16 100644
--- a/src/pages/System/User/UserView.js
+++ b/src/pages/System/User/UserView.js
@@ -5,6 +5,7 @@ import { connect } from 'dva';
 import Panel from '../../../components/Panel';
 import { USER_DETAIL } from '../../../actions/user';
 import styles from '../../../layouts/Sword.less';
+import { tenantMode } from '../../../defaultSettings';
 
 const FormItem = Form.Item;
 
@@ -46,6 +47,15 @@ class UserView extends PureComponent {
       },
     };
 
+    const formAllItemLayout = {
+      labelCol: {
+        span: 4,
+      },
+      wrapperCol: {
+        span: 20,
+      },
+    };
+
     const action = (
       <Button type="primary" onClick={this.handleEdit}>
         修改
@@ -57,17 +67,21 @@ class UserView extends PureComponent {
         <Form hideRequiredMark style={{ marginTop: 8 }}>
           <Card title="基本信息" className={styles.card} bordered={false}>
             <Row gutter={24}>
-              <Col span={10}>
-                <FormItem {...formItemLayout} label="登录账号">
+              <Col span={20}>
+                <FormItem {...formAllItemLayout} label="登录账号">
                   <span>{detail.account}</span>
                 </FormItem>
               </Col>
-              <Col span={10}>
-                <FormItem {...formItemLayout} label="所属租户">
-                  <span>{detail.tenantCode}</span>
-                </FormItem>
-              </Col>
             </Row>
+            {tenantMode ? (
+              <Row gutter={24}>
+                <Col span={20}>
+                  <FormItem {...formAllItemLayout} label="所属租户">
+                    <span>{detail.tenantCode}</span>
+                  </FormItem>
+                </Col>
+              </Row>
+            ) : null}
             <Row gutter={24}>
               <Col span={10}>
                 <FormItem {...formItemLayout} label="用户昵称">
diff --git a/tslint.json b/tslint.json
index 125e217..dd26500 100644
--- a/tslint.json
+++ b/tslint.json
@@ -7,5 +7,8 @@
     "jsx-no-lambda": false,
     "no-implicit-dependencies": false,
     "no-console": false
+  },
+  "jsRules": {
+    "object-literal-sort-keys": false
   }
 }