feat:新增部门、菜单租户唯一逻辑

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DataSourceServiceImpl.java

@@ -10,6 +10,7 @@ import com.ruoyi.system.service.IDataSourceService;
 import com.ruoyi.system.service.ISysTenantService;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.token.TokenService;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantServiceImpl.java

@@ -134,7 +134,7 @@ public class SysTenantServiceImpl implements ISysTenantService
         List<SysMenu> list = new ArrayList<>();
         try {
             // 读取所有行
-            List<String> lines = Files.readAllLines(Paths.get("ruoyi-system\\src\\main\\resources\\sql\\initialize_sys_tenant_menu.sql"));
+            List<String> lines = Files.readAllLines(Paths.get("ruoyi-system/src/main/resources/sql/initialize_sys_tenant_menu.sql"));
             List<Long> ids = lines.stream().map(Long::parseLong).collect(Collectors.toList());
             System.err.println(ids);
             //根据菜单编号获取租户菜单信息

ruoyi-ui/src/views/system/dept/index.vue

@@ -35,10 +35,12 @@
           icon="el-icon-search"
           size="mini"
           @click="handleQuery"
-          >搜索</el-button
+        >搜索
+        </el-button
         >
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-          >重置</el-button
+        >重置
+        </el-button
         >
       </el-form-item>
     </el-form>
@@ -52,7 +54,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['system:dept:add']"
-          >新增</el-button
+        >新增
+        </el-button
         >
       </el-col>
       <el-col :span="1.5">
@@ -62,7 +65,8 @@
           icon="el-icon-sort"
           size="mini"
           @click="toggleExpandAll"
-          >展开/折叠</el-button
+        >展开/折叠
+        </el-button
         >
       </el-col>
       <right-toolbar
@@ -119,35 +123,44 @@
             </el-button>
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item
-                ><el-button
+              >
+                <el-button
                   size="mini"
                   type="text"
                   icon="el-icon-edit"
                   @click="handleUpdate(scope.row)"
                   v-hasPermi="['system:dept:edit']"
-                  >修改</el-button
-                ></el-dropdown-item
+                >修改
+                </el-button
+                >
+              </el-dropdown-item
               >
               <el-dropdown-item
-                ><el-button
+              >
+                <el-button
                   size="mini"
                   type="text"
                   icon="el-icon-plus"
                   @click="handleAdd(scope.row)"
                   v-hasPermi="['system:dept:add']"
-                  >新增</el-button
-                ></el-dropdown-item
+                >新增
+                </el-button
+                >
+              </el-dropdown-item
               >
               <el-dropdown-item
-                ><el-button
+              >
+                <el-button
                   v-if="scope.row.parentId != 0"
                   size="mini"
                   type="text"
                   icon="el-icon-delete"
                   @click="handleDelete(scope.row)"
                   v-hasPermi="['system:dept:remove']"
-                  >删除</el-button
-                ></el-dropdown-item
+                >删除
+                </el-button
+                >
+              </el-dropdown-item
               >
             </el-dropdown-menu>
           </el-dropdown>
@@ -196,7 +209,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="部门名称" prop="deptName">
-              <el-input v-model="form.deptName" placeholder="请输入部门名称" />
+              <el-input v-model="form.deptName" placeholder="请输入部门名称"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -246,7 +259,8 @@
                   v-for="dict in dict.type.sys_normal_disable"
                   :key="dict.value"
                   :label="dict.value"
-                  >{{ dict.label }}</el-radio
+                >{{ dict.label }}
+                </el-radio
                 >
               </el-radio-group>
             </el-form-item>
@@ -276,7 +290,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 export default {
   name: "Dept",
   dicts: ["sys_normal_disable"],
-  components: { Treeselect },
+  components: {Treeselect},
   data() {
     return {
       // 遮罩层
@@ -308,10 +322,10 @@ export default {
         //   { required: true, message: "上级部门不能为空", trigger: "blur" },
         // ],
         deptName: [
-          { required: true, message: "部门名称不能为空", trigger: "blur" },
+          {required: true, message: "部门名称不能为空", trigger: "blur"},
         ],
         orderNum: [
-          { required: true, message: "显示排序不能为空", trigger: "blur" },
+          {required: true, message: "显示排序不能为空", trigger: "blur"},
         ],
         email: [
           {
@@ -426,6 +440,7 @@ export default {
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.deptId != undefined) {
+            this.form['tenantId'] = this.$store.state.user.tenant.tenantId
             updateDept(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
@@ -435,6 +450,7 @@ export default {
             if (typeof this.form.parentId == "undefined") {
               this.form.parentId = 0;
             }
+            this.form['tenantId'] = this.$store.state.user.tenant.tenantId
             addDept(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
@@ -455,7 +471,8 @@ export default {
           this.getList();
           this.$modal.msgSuccess("删除成功");
         })
-        .catch(() => {});
+        .catch(() => {
+        });
     },
   },
 };

ruoyi-ui/src/views/system/menu/index.vue

@@ -2,15 +2,17 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
       <el-form-item label="菜单名称" prop="menuName">
-        <el-input v-model="queryParams.menuName" placeholder="请输入菜单名称" clearable @keyup.enter.native="handleQuery" />
+        <el-input v-model="queryParams.menuName" placeholder="请输入菜单名称" clearable
+                  @keyup.enter.native="handleQuery"/>
       </el-form-item>
       <el-form-item label="租户名称" prop="tenantName">
-        <el-input v-model="queryParams.tenantName" placeholder="请输入租户名称" clearable @keyup.enter.native="handleQuery" />
+        <el-input v-model="queryParams.tenantName" placeholder="请输入租户名称" clearable
+                  @keyup.enter.native="handleQuery"/>
       </el-form-item>
       <el-form-item label="状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="菜单状态" clearable>
           <el-option v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.label"
-            :value="dict.value" />
+                     :value="dict.value"/>
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -22,7 +24,8 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-          v-hasPermi="['system:menu:add']">新增</el-button>
+                   v-hasPermi="['system:menu:add']">新增
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button type="info" plain icon="el-icon-sort" size="mini" @click="toggleExpandAll">展开/折叠</el-button>
@@ -30,12 +33,13 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-if="refreshTable" v-loading="loading" :data="menuList" row-key="menuId" :default-expand-all="isExpandAll"
-      :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
+    <el-table v-if="refreshTable" v-loading="loading" :data="menuList" row-key="menuId"
+              :default-expand-all="isExpandAll"
+              :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
       <el-table-column prop="menuName" label="菜单名称" :show-overflow-tooltip="true" width="160"></el-table-column>
       <el-table-column prop="icon" label="图标" align="center" width="100">
         <template slot-scope="scope">
-          <svg-icon :icon-class="scope.row.icon" />
+          <svg-icon :icon-class="scope.row.icon"/>
         </template>
       </el-table-column>
       <el-table-column prop="orderNum" label="排序" width="60"></el-table-column>
@@ -43,7 +47,7 @@
       <el-table-column prop="component" label="组件路径" :show-overflow-tooltip="true"></el-table-column>
       <el-table-column prop="status" label="状态" width="80">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status" />
+          <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
         </template>
       </el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime">
@@ -59,12 +63,21 @@
               处理<i class="el-icon-arrow-down el-icon--right"></i>
             </el-button>
             <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item><el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-                  v-hasPermi="['system:menu:edit']">修改</el-button></el-dropdown-item>
-              <el-dropdown-item><el-button size="mini" type="text" icon="el-icon-plus" @click="handleAdd(scope.row)"
-                  v-hasPermi="['system:menu:add']">新增</el-button></el-dropdown-item>
-              <el-dropdown-item><el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                  v-hasPermi="['system:menu:remove']">删除</el-button></el-dropdown-item>
+              <el-dropdown-item>
+                <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+                           v-hasPermi="['system:menu:edit']">修改
+                </el-button>
+              </el-dropdown-item>
+              <el-dropdown-item>
+                <el-button size="mini" type="text" icon="el-icon-plus" @click="handleAdd(scope.row)"
+                           v-hasPermi="['system:menu:add']">新增
+                </el-button>
+              </el-dropdown-item>
+              <el-dropdown-item>
+                <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                           v-hasPermi="['system:menu:remove']">删除
+                </el-button>
+              </el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
 
@@ -100,7 +113,7 @@
           <el-col :span="24">
             <el-form-item label="上级菜单" prop="parentId">
               <treeselect v-model="form.parentId" :options="menuOptions" :normalizer="normalizer" :show-count="true"
-                placeholder="选择上级菜单" />
+                          placeholder="选择上级菜单"/>
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -115,22 +128,22 @@
           <el-col :span="24" v-if="form.menuType != 'F'">
             <el-form-item label="菜单图标" prop="icon">
               <el-popover placement="bottom-start" width="460" trigger="click" @show="$refs['iconSelect'].reset()">
-                <IconSelect ref="iconSelect" @selected="selected" :active-icon="form.icon" />
+                <IconSelect ref="iconSelect" @selected="selected" :active-icon="form.icon"/>
                 <el-input slot="reference" v-model="form.icon" placeholder="点击选择图标" readonly>
-                  <svg-icon v-if="form.icon" slot="prefix" :icon-class="form.icon" style="width: 25px" />
-                  <i v-else slot="prefix" class="el-icon-search el-input__icon" />
+                  <svg-icon v-if="form.icon" slot="prefix" :icon-class="form.icon" style="width: 25px"/>
+                  <i v-else slot="prefix" class="el-icon-search el-input__icon"/>
                 </el-input>
               </el-popover>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="菜单名称" prop="menuName">
-              <el-input v-model="form.menuName" placeholder="请输入菜单名称" />
+              <el-input v-model="form.menuName" placeholder="请输入菜单名称"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="显示排序" prop="orderNum">
-              <el-input-number v-model="form.orderNum" controls-position="right" :min="0" />
+              <el-input-number v-model="form.orderNum" controls-position="right" :min="0"/>
             </el-form-item>
           </el-col>
           <el-col :span="12" v-if="form.menuType != 'F'">
@@ -155,7 +168,7 @@
                 </el-tooltip>
                 路由地址
               </span>
-              <el-input v-model="form.path" placeholder="请输入路由地址" />
+              <el-input v-model="form.path" placeholder="请输入路由地址"/>
             </el-form-item>
           </el-col>
           <el-col :span="12" v-if="form.menuType == 'C'">
@@ -166,14 +179,15 @@
                 </el-tooltip>
                 组件路径
               </span>
-              <el-input v-model="form.component" placeholder="请输入组件路径" />
+              <el-input v-model="form.component" placeholder="请输入组件路径"/>
             </el-form-item>
           </el-col>
           <el-col :span="12" v-if="form.menuType != 'M'">
             <el-form-item prop="perms">
-              <el-input v-model="form.perms" placeholder="请输入权限标识" maxlength="100" />
+              <el-input v-model="form.perms" placeholder="请输入权限标识" maxlength="100"/>
               <span slot="label">
-                <el-tooltip content="控制器中定义的权限字符，如：@PreAuthorize(`@ss.hasPermi('system:user:list')`)" placement="top">
+                <el-tooltip content="控制器中定义的权限字符，如：@PreAuthorize(`@ss.hasPermi('system:user:list')`)"
+                            placement="top">
                   <i class="el-icon-question"></i>
                 </el-tooltip>
                 权限字符
@@ -182,7 +196,7 @@
           </el-col>
           <el-col :span="12" v-if="form.menuType == 'C'">
             <el-form-item prop="query">
-              <el-input v-model="form.query" placeholder="请输入路由参数" maxlength="255" />
+              <el-input v-model="form.query" placeholder="请输入路由参数" maxlength="255"/>
               <span slot="label">
                 <el-tooltip content='访问路由的默认传递参数，如：`{"id": 1, "name": "ry"}`' placement="top">
                   <i class="el-icon-question"></i>
@@ -214,8 +228,10 @@
                 显示状态
               </span>
               <el-radio-group v-model="form.visible">
-                <el-radio v-for="dict in dict.type.sys_show_hide" :key="dict.value" :label="dict.value">{{ dict.label
-                }}</el-radio>
+                <el-radio v-for="dict in dict.type.sys_show_hide" :key="dict.value" :label="dict.value">{{
+                    dict.label
+                  }}
+                </el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -228,8 +244,10 @@
                 菜单状态
               </span>
               <el-radio-group v-model="form.status">
-                <el-radio v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.value">{{ dict.label
-                }}</el-radio>
+                <el-radio v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.value">{{
+                    dict.label
+                  }}
+                </el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -258,7 +276,7 @@ import IconSelect from "@/components/IconSelect";
 export default {
   name: "Menu",
   dicts: ["sys_show_hide", "sys_normal_disable"],
-  components: { Treeselect, IconSelect },
+  components: {Treeselect, IconSelect},
   data() {
     return {
       // 遮罩层
@@ -288,13 +306,13 @@ export default {
       // 表单校验
       rules: {
         menuName: [
-          { required: true, message: "菜单名称不能为空", trigger: "blur" },
+          {required: true, message: "菜单名称不能为空", trigger: "blur"},
         ],
         orderNum: [
-          { required: true, message: "菜单顺序不能为空", trigger: "blur" },
+          {required: true, message: "菜单顺序不能为空", trigger: "blur"},
         ],
         path: [
-          { required: true, message: "路由地址不能为空", trigger: "blur" },
+          {required: true, message: "路由地址不能为空", trigger: "blur"},
         ],
       },
     };
@@ -330,7 +348,7 @@ export default {
     getTreeselect() {
       listMenu().then((response) => {
         this.menuOptions = [];
-        const menu = { menuId: 0, menuName: "主类目", children: [] };
+        const menu = {menuId: 0, menuName: "主类目", children: []};
         menu.children = this.handleTree(response.data, "menuId");
         this.menuOptions.push(menu);
       });
@@ -400,12 +418,14 @@ export default {
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.menuId != undefined) {
+            this.form['tenantId'] = this.$store.state.user.tenant.tenantId
             updateMenu(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
+            this.form['tenantId'] = this.$store.state.user.tenant.tenantId
             addMenu(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
@@ -426,7 +446,8 @@ export default {
           this.getList();
           this.$modal.msgSuccess("删除成功");
         })
-        .catch(() => { });
+        .catch(() => {
+        });
     },
   },
 };