From 22a9cc9b21b6675558d67c91b0094ec49ea661be Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Thu, 6 May 2021 10:40:08 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/dataease/base/domain/SysDept.java |  2 -
 .../dataease/base/domain/SysDeptExample.java  | 60 -------------------
 .../io/dataease/base/mapper/SysDeptMapper.xml | 30 +++-------
 .../io/dataease/service/sys/DeptService.java  |  1 -
 .../resources/db/migration/V8__system.sql     | 15 +++--
 .../src/main/resources/generatorConfig.xml    |  2 +-
 frontend/src/views/system/dept/form.vue       |  7 +--
 frontend/src/views/system/dept/index.vue      |  3 +-
 frontend/src/views/system/role/index.vue      |  3 +-
 frontend/src/views/system/user/index.vue      |  3 +-
 10 files changed, 24 insertions(+), 102 deletions(-)

diff --git a/backend/src/main/java/io/dataease/base/domain/SysDept.java b/backend/src/main/java/io/dataease/base/domain/SysDept.java
index f62eab73fc..636da7da85 100644
--- a/backend/src/main/java/io/dataease/base/domain/SysDept.java
+++ b/backend/src/main/java/io/dataease/base/domain/SysDept.java
@@ -15,8 +15,6 @@ public class SysDept implements Serializable {
 
     private Integer deptSort;
 
-    private Boolean enabled;
-
     private String createBy;
 
     private String updateBy;
diff --git a/backend/src/main/java/io/dataease/base/domain/SysDeptExample.java b/backend/src/main/java/io/dataease/base/domain/SysDeptExample.java
index 6d0598519e..8b72401dfe 100644
--- a/backend/src/main/java/io/dataease/base/domain/SysDeptExample.java
+++ b/backend/src/main/java/io/dataease/base/domain/SysDeptExample.java
@@ -414,66 +414,6 @@ public class SysDeptExample {
             return (Criteria) this;
         }
 
-        public Criteria andEnabledIsNull() {
-            addCriterion("enabled is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andEnabledIsNotNull() {
-            addCriterion("enabled is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andEnabledEqualTo(Boolean value) {
-            addCriterion("enabled =", value, "enabled");
-            return (Criteria) this;
-        }
-
-        public Criteria andEnabledNotEqualTo(Boolean value) {
-            addCriterion("enabled <>", value, "enabled");
-            return (Criteria) this;
-        }
-
-        public Criteria andEnabledGreaterThan(Boolean value) {
-            addCriterion("enabled >", value, "enabled");
-            return (Criteria) this;
-        }
-
-        public Criteria andEnabledGreaterThanOrEqualTo(Boolean value) {
-            addCriterion("enabled >=", value, "enabled");
-            return (Criteria) this;
-        }
-
-        public Criteria andEnabledLessThan(Boolean value) {
-            addCriterion("enabled <", value, "enabled");
-            return (Criteria) this;
-        }
-
-        public Criteria andEnabledLessThanOrEqualTo(Boolean value) {
-            addCriterion("enabled <=", value, "enabled");
-            return (Criteria) this;
-        }
-
-        public Criteria andEnabledIn(List<Boolean> values) {
-            addCriterion("enabled in", values, "enabled");
-            return (Criteria) this;
-        }
-
-        public Criteria andEnabledNotIn(List<Boolean> values) {
-            addCriterion("enabled not in", values, "enabled");
-            return (Criteria) this;
-        }
-
-        public Criteria andEnabledBetween(Boolean value1, Boolean value2) {
-            addCriterion("enabled between", value1, value2, "enabled");
-            return (Criteria) this;
-        }
-
-        public Criteria andEnabledNotBetween(Boolean value1, Boolean value2) {
-            addCriterion("enabled not between", value1, value2, "enabled");
-            return (Criteria) this;
-        }
-
         public Criteria andCreateByIsNull() {
             addCriterion("create_by is null");
             return (Criteria) this;
diff --git a/backend/src/main/java/io/dataease/base/mapper/SysDeptMapper.xml b/backend/src/main/java/io/dataease/base/mapper/SysDeptMapper.xml
index 2e5860c6fc..30bbfe7c29 100644
--- a/backend/src/main/java/io/dataease/base/mapper/SysDeptMapper.xml
+++ b/backend/src/main/java/io/dataease/base/mapper/SysDeptMapper.xml
@@ -7,7 +7,6 @@
     <result column="sub_count" jdbcType="INTEGER" property="subCount" />
     <result column="name" jdbcType="VARCHAR" property="name" />
     <result column="dept_sort" jdbcType="INTEGER" property="deptSort" />
-    <result column="enabled" jdbcType="BIT" property="enabled" />
     <result column="create_by" jdbcType="VARCHAR" property="createBy" />
     <result column="update_by" jdbcType="VARCHAR" property="updateBy" />
     <result column="create_time" jdbcType="BIGINT" property="createTime" />
@@ -72,8 +71,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    dept_id, pid, sub_count, `name`, dept_sort, enabled, create_by, update_by, create_time, 
-    update_time
+    dept_id, pid, sub_count, `name`, dept_sort, create_by, update_by, create_time, update_time
   </sql>
   <select id="selectByExample" parameterType="io.dataease.base.domain.SysDeptExample" resultMap="BaseResultMap">
     select
@@ -107,13 +105,13 @@
   </delete>
   <insert id="insert" parameterType="io.dataease.base.domain.SysDept">
     insert into sys_dept (dept_id, pid, sub_count, 
-      `name`, dept_sort, enabled, 
-      create_by, update_by, create_time, 
-      update_time)
+      `name`, dept_sort, create_by, 
+      update_by, create_time, update_time
+      )
     values (#{deptId,jdbcType=BIGINT}, #{pid,jdbcType=BIGINT}, #{subCount,jdbcType=INTEGER}, 
-      #{name,jdbcType=VARCHAR}, #{deptSort,jdbcType=INTEGER}, #{enabled,jdbcType=BIT}, 
-      #{createBy,jdbcType=VARCHAR}, #{updateBy,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, 
-      #{updateTime,jdbcType=BIGINT})
+      #{name,jdbcType=VARCHAR}, #{deptSort,jdbcType=INTEGER}, #{createBy,jdbcType=VARCHAR}, 
+      #{updateBy,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT}
+      )
   </insert>
   <insert id="insertSelective" parameterType="io.dataease.base.domain.SysDept">
     insert into sys_dept
@@ -133,9 +131,6 @@
       <if test="deptSort != null">
         dept_sort,
       </if>
-      <if test="enabled != null">
-        enabled,
-      </if>
       <if test="createBy != null">
         create_by,
       </if>
@@ -165,9 +160,6 @@
       <if test="deptSort != null">
         #{deptSort,jdbcType=INTEGER},
       </if>
-      <if test="enabled != null">
-        #{enabled,jdbcType=BIT},
-      </if>
       <if test="createBy != null">
         #{createBy,jdbcType=VARCHAR},
       </if>
@@ -206,9 +198,6 @@
       <if test="record.deptSort != null">
         dept_sort = #{record.deptSort,jdbcType=INTEGER},
       </if>
-      <if test="record.enabled != null">
-        enabled = #{record.enabled,jdbcType=BIT},
-      </if>
       <if test="record.createBy != null">
         create_by = #{record.createBy,jdbcType=VARCHAR},
       </if>
@@ -233,7 +222,6 @@
       sub_count = #{record.subCount,jdbcType=INTEGER},
       `name` = #{record.name,jdbcType=VARCHAR},
       dept_sort = #{record.deptSort,jdbcType=INTEGER},
-      enabled = #{record.enabled,jdbcType=BIT},
       create_by = #{record.createBy,jdbcType=VARCHAR},
       update_by = #{record.updateBy,jdbcType=VARCHAR},
       create_time = #{record.createTime,jdbcType=BIGINT},
@@ -257,9 +245,6 @@
       <if test="deptSort != null">
         dept_sort = #{deptSort,jdbcType=INTEGER},
       </if>
-      <if test="enabled != null">
-        enabled = #{enabled,jdbcType=BIT},
-      </if>
       <if test="createBy != null">
         create_by = #{createBy,jdbcType=VARCHAR},
       </if>
@@ -281,7 +266,6 @@
       sub_count = #{subCount,jdbcType=INTEGER},
       `name` = #{name,jdbcType=VARCHAR},
       dept_sort = #{deptSort,jdbcType=INTEGER},
-      enabled = #{enabled,jdbcType=BIT},
       create_by = #{createBy,jdbcType=VARCHAR},
       update_by = #{updateBy,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=BIGINT},
diff --git a/backend/src/main/java/io/dataease/service/sys/DeptService.java b/backend/src/main/java/io/dataease/service/sys/DeptService.java
index a3c74199ea..cfafe41368 100644
--- a/backend/src/main/java/io/dataease/service/sys/DeptService.java
+++ b/backend/src/main/java/io/dataease/service/sys/DeptService.java
@@ -123,7 +123,6 @@ public class DeptService {
         boolean status = request.isStatus();
         SysDept sysDept = new SysDept();
         sysDept.setDeptId(deptId);
-        sysDept.setEnabled(status);
         return sysDeptMapper.updateByPrimaryKeySelective(sysDept);
     }
 
diff --git a/backend/src/main/resources/db/migration/V8__system.sql b/backend/src/main/resources/db/migration/V8__system.sql
index 9e72f6ed64..f3412908ae 100644
--- a/backend/src/main/resources/db/migration/V8__system.sql
+++ b/backend/src/main/resources/db/migration/V8__system.sql
@@ -8,31 +8,30 @@ CREATE TABLE `sys_dept` (
   `sub_count` int(5) DEFAULT '0' COMMENT '子部门数目',
   `name` varchar(255) NOT NULL COMMENT '名称',
   `dept_sort` int(5) DEFAULT '999' COMMENT '排序',
-  `enabled` bit(1) NOT NULL COMMENT '状态',
   `create_by` varchar(255) DEFAULT NULL COMMENT '创建者',
   `update_by` varchar(255) DEFAULT NULL COMMENT '更新者',
   `create_time` bigint(13) DEFAULT NULL COMMENT '创建日期',
   `update_time` bigint(13) DEFAULT NULL COMMENT '更新时间',
   PRIMARY KEY (`dept_id`) USING BTREE,
-  KEY `inx_pid` (`pid`),
-  KEY `inx_enabled` (`enabled`)
+  KEY `inx_pid` (`pid`)
 ) ENGINE=InnoDB AUTO_INCREMENT=26 DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='部门';
 
 -- ----------------------------
 -- Records of sys_dept
 -- ----------------------------
 BEGIN;
-INSERT INTO `sys_dept` VALUES (18, 0, 1, '上海飞致云', 1, b'1', NULL, NULL, 1614048906358, 1614048906358);
-INSERT INTO `sys_dept` VALUES (19, 0, 1, '北京飞致云', 2, b'1', NULL, NULL, 1614048918465, 1614048918465);
-INSERT INTO `sys_dept` VALUES (20, 18, 1, '营销部', 1, b'1', NULL, NULL, 1614048946370, 1614049006759);
-INSERT INTO `sys_dept` VALUES (21, 19, 0, '综合部', 3, b'1', NULL, NULL, 1614048963483, 1619667528267);
-INSERT INTO `sys_dept` VALUES (25, 20, 0, '售前组', 1, b'1', NULL, NULL, 1615791706945, 1615791706945);
+INSERT INTO `sys_dept` VALUES (18, 0, 1, '上海飞致云', 1, NULL, NULL, 1614048906358, 1614048906358);
+INSERT INTO `sys_dept` VALUES (19, 0, 1, '北京飞致云', 2, NULL, NULL, 1614048918465, 1614048918465);
+INSERT INTO `sys_dept` VALUES (20, 18, 1, '营销部', 1, NULL, NULL, 1614048946370, 1614049006759);
+INSERT INTO `sys_dept` VALUES (21, 19, 0, '综合部', 3, NULL, NULL, 1614048963483, 1619667528267);
+INSERT INTO `sys_dept` VALUES (25, 20, 0, '售前组', 1, NULL, NULL, 1615791706945, 1615791706945);
 COMMIT;
 
 SET FOREIGN_KEY_CHECKS = 1;
 
 
 
+
 -- ----------------------------
 -- Table structure for sys_menu
 -- ----------------------------
diff --git a/backend/src/main/resources/generatorConfig.xml b/backend/src/main/resources/generatorConfig.xml
index dc7fbed3dd..c8c841cc56 100644
--- a/backend/src/main/resources/generatorConfig.xml
+++ b/backend/src/main/resources/generatorConfig.xml
@@ -67,7 +67,7 @@
         <!--        <table tableName="datasource"/>-->
 <!--        <table tableName="sys_dict"/>-->
 <!--        <table tableName="sys_dict_item"/>-->
-        <table tableName="sys_role"/>
+        <table tableName="sys_dept"/>
 <!--        <table tableName="panel_design"/>-->
 
 
diff --git a/frontend/src/views/system/dept/form.vue b/frontend/src/views/system/dept/form.vue
index 9d767d63ca..3b50f28957 100644
--- a/frontend/src/views/system/dept/form.vue
+++ b/frontend/src/views/system/dept/form.vue
@@ -21,14 +21,13 @@
         </el-radio-group>
       </el-form-item>
 
-      <el-form-item label="状态" prop="enabled">
+      <!-- <el-form-item label="状态" prop="enabled">
         <el-radio-group v-model="form.enabled" disabled>
           <el-radio :label="true">启用</el-radio>
           <el-radio :label="false">停用</el-radio>
         </el-radio-group>
 
-        <!-- <el-radio v-for="item in dict.dept_status" :key="item.id" v-model="form.enabled" :label="item.value">{{ item.label }}</el-radio> -->
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item v-if="!form.top" label="上级组织" prop="pid">
         <treeselect
           v-model="form.pid"
@@ -59,7 +58,7 @@ export default {
   components: { LayoutContent, Treeselect },
   data() {
     return {
-      defaultForm: { deptId: null, top: true, enabled: true, pid: null },
+      defaultForm: { deptId: null, top: true, pid: null },
       maps: new Map(),
       form: {},
       rule: {
diff --git a/frontend/src/views/system/dept/index.vue b/frontend/src/views/system/dept/index.vue
index a2c25378a8..7f03b03df9 100644
--- a/frontend/src/views/system/dept/index.vue
+++ b/frontend/src/views/system/dept/index.vue
@@ -23,7 +23,8 @@
       @search="search"
     >
       <template #toolbar>
-        <fu-table-button v-permission="['dept:add']" icon="el-icon-circle-plus-outline" :label="$t('organization.create')" @click="create" />
+        <el-button v-permission="['dept:add']" icon="el-icon-circle-plus-outline" @click="create">{{ $t('organization.create') }}</el-button>
+        <!-- <fu-table-button v-permission="['dept:add']" icon="el-icon-circle-plus-outline" :label="$t('organization.create')" @click="create" /> -->
       </template>
       <el-table
         ref="table"
diff --git a/frontend/src/views/system/role/index.vue b/frontend/src/views/system/role/index.vue
index d9da386af5..981a0b275c 100644
--- a/frontend/src/views/system/role/index.vue
+++ b/frontend/src/views/system/role/index.vue
@@ -14,7 +14,8 @@
           @row-click="rowClick"
         >
           <template #toolbar>
-            <fu-table-button icon="el-icon-circle-plus-outline" :label="$t('role.add')" @click="create" />
+            <!-- <fu-table-button icon="el-icon-circle-plus-outline" :label="$t('role.add')" @click="create" /> -->
+            <el-button v-permission="['role:add']" icon="el-icon-circle-plus-outline" @click="create">{{ $t('role.add') }}</el-button>
           </template>
 
           <el-table-column prop="name" label="名称" />
diff --git a/frontend/src/views/system/user/index.vue b/frontend/src/views/system/user/index.vue
index 76fd8e07e9..ec8f0f627e 100644
--- a/frontend/src/views/system/user/index.vue
+++ b/frontend/src/views/system/user/index.vue
@@ -10,7 +10,8 @@
       @search="search"
     >
       <template #toolbar>
-        <fu-table-button v-permission="['user:add']" icon="el-icon-circle-plus-outline" :label="$t('user.create')" @click="create" />
+        <el-button v-permission="['user:add']" icon="el-icon-circle-plus-outline" @click="create">{{ $t('user.create') }}</el-button>
+        <!-- <fu-table-button v-permission="['user:add']" icon="el-icon-circle-plus-outline" :label="$t('user.create')" @click="create" /> -->
       </template>
 
       <el-table-column prop="username" label="ID" width="80" />