From 9d748bffeb6a27e939cf7430c1be19ca11d9b3fa Mon Sep 17 00:00:00 2001
From: shiji <1913712590@qq.com>
Date: Wed, 26 Jul 2023 15:07:27 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=AE=9E=E4=BD=93=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=20=E7=BB=93=E6=9E=84=E5=9B=BE=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/tablex/TablexList.vue               |  6 ++++--
 .../tablex/controller/TablexController.java       | 15 ++++++++-------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/ant-design-vue-jeecg/src/views/tablex/TablexList.vue b/ant-design-vue-jeecg/src/views/tablex/TablexList.vue
index 3206d4e..40c1507 100644
--- a/ant-design-vue-jeecg/src/views/tablex/TablexList.vue
+++ b/ant-design-vue-jeecg/src/views/tablex/TablexList.vue
@@ -157,7 +157,8 @@ import JEllipsis from '@/components/jeecg/JEllipsis'
 import FieldxList from "@/views/fieldx/FieldxList";
 import {getAction, httpAction} from "@api/manage";
 import {filterObj} from "@/utils/util";
-import {JVXETypes} from "@comp/jeecg/JVxeTable";
+// import {JVXETypes} from "@comp/jeecg/JVxeTable";
+import { JVXETypes } from '@/components/jeecg/JVxeTable'
 
 export default {
   name: 'TablexList',
@@ -230,7 +231,8 @@ export default {
         {
           title:'结构图', width: '10%',
           key: 'structuralDiagram',
-          type: JVXETypes.upload,
+          type:JVXETypes.image,
+          token:true,
           scopedSlots: {customRender: 'imgSlot'},
           align: 'center',
 
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/tablex/controller/TablexController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/tablex/controller/TablexController.java
index ba44718..e4f86c2 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/tablex/controller/TablexController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/tablex/controller/TablexController.java
@@ -49,6 +49,7 @@ import org.jeecgframework.poi.excel.entity.TemplateExportParams;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecgframework.poi.excel.view.JeecgTemplateExcelView;
+import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -194,14 +195,14 @@ public class TablexController extends JeecgController<Tablex, ITablexService> {
     @AutoLog(value = "实体表-编辑")
     @ApiOperation(value = "实体表-编辑", notes = "实体表-编辑")
     @PutMapping(value = "/edit")
-    public Result<?> edit(@RequestBody Tablex tablex) {
+    public Result<?> edit(@NotNull @RequestBody Tablex tablex) {
         tablex.setVerison(tablex.getVerison() + 1);
-        List<Tablex> tablexList = tablexService.list();
-        for (Tablex tablex1 : tablexList) {
-            if (tablex1.getModuleId().equals(tablex.getModuleId())) {
-                return Result.error("该模块已有实体，编辑失败");
-            }
-        }
+//        List<Tablex> tablexList = tablexService.list();
+//        for (Tablex tablex1 : tablexList) {
+//            if (tablex1.getModuleId().equals(tablex.getModuleId())) {
+//                return Result.error("该模块已有实体，编辑失败");
+//            }
+//        }
         if (tablex.getModuleId() != null) {
             Modulex modulex = modulexService.getById(tablex.getModuleId());
             tablex.setTableName(modulex.getModuleName());