Merge branch 'master' of http://49.233.37.222:3000/wjm/mec-cloud_IntelligentManufacturing_CRM

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/components/updateModule/k-form-design/packages/components/KFormDesign/index.vue

@@ -274,7 +274,7 @@ export default {
   },
   methods: {
     generateKey(list, index) {
-      console.log('generateKey');
+      // console.log('generateKey');
       // 生成key值
       const key = list[index].type + "_" + new Date().getTime();
       this.$set(list, index, {
@@ -491,7 +491,7 @@ export default {
 
     handleSave() {
       // 保存函数
-      console.log(this.data)
+      // console.log(this.data)
       this.$emit("save", JSON.stringify(this.data));
     },
     getValue() {

ruoyi-ui/src/components/updateModule/k-form-design/packages/components/KFormDesign/module/formItemProperties.vue

@@ -50,9 +50,6 @@
           </el-select>
         </a-form-item>
        
-        
-
-
         <!-- input type start -->
         <a-form-item v-if="selectItem.type === 'input'" label="输入框type">
           <Input v-model="options.type" placeholder="请输入" />
@@ -685,8 +682,12 @@ export default {
   },
   computed: {
     options() {
+      if(!this.selectItem.tableName){
+        this.formList.listName = [];
+      }
       return this.selectItem.options || {};
-    }
+    },
+
   },
   props: {
     selectItem: {
@@ -720,6 +721,7 @@ export default {
         ... this.$store.state.user.dataSource,
         'tableName':this.selectItem.tableName
       }
+      
       getListName(par2).then(res=>{
         this.formList.listName = res.map(item => {
           return {
@@ -733,5 +735,6 @@ export default {
   mounted() {
     this.getFormList();
   },
+  
 };
 </script>

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

@@ -579,12 +579,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;