4-15

# Conflicts:
#	jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/mapper/ModulexMapper.java

ant-design-vue-jeecg/src/views/fieldx/FieldxList.vue

@@ -77,7 +77,6 @@
       return {
         description: '字段管理管理页面',
         tableid:'',
-        tablename:'',
         visible: false,
         confirmLoading: false,
         // 工具栏的按钮配置
@@ -119,7 +118,6 @@
             key: 'tableId_dictText', title: '对应实体', width: '6%',
             type: JVXETypes.normal,
             disabled: true,
-            defaultValue:this.tablename,
           },
           {
             key: 'fieldName', title: '中文名称', width: '6%',
@@ -260,13 +258,16 @@
         let method = '';
         if (str.search("row") !== -1) {
           props.row.id ='';
+          console.log("新增")
           httpurl += this.url.add;
           method = 'post';
         } else {
+          console.log("编辑")
           httpurl += this.url.edit;
           method = 'put';
         }
         props.row.tableId = this.tableid
+        console.log(props.row)
         httpAction(httpurl, props.row, method).then((res) => {
           if (res.success) {
             this.$message.success(res.message);
@@ -275,6 +276,7 @@
             this.$message.warning(res.message);
           }
         })
+        props.row
       },
       //新增触发事件
       added(event) {

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/mapper/ModulexMapper.java

@@ -3,6 +3,7 @@ package org.jeecg.modules.modulex.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
 import org.jeecg.modules.modulex.entity.Modulex;
 
 /**
@@ -15,4 +16,7 @@ public interface ModulexMapper extends BaseMapper<Modulex> {
 
     @Select("SELECT realname FROM sys_user WHERE id = #{id}")
     String getRealName(String id);
+
+    @Update("update modulex set related_bean=#{tablex} where id = #{moduleId}")
+    void setmodule(String tablex, String moduleId);
 }

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/service/IModulexService.java

@@ -27,4 +27,7 @@ public interface IModulexService extends IService<Modulex> {
     Result<?> chehui(String id);
 
     Result<?> shenhe(String id);
+
+    void setmodule(String id, String moduleId);
+
 }

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/service/impl/ModulexServiceImpl.java

@@ -29,6 +29,9 @@ public class ModulexServiceImpl extends ServiceImpl<ModulexMapper, Modulex> impl
     @Resource
     private FunctionxMapper functionxMapper;
 
+    @Resource
+    private ModulexMapper modulexMapper;
+
     /**
      * 得到最大的版本号
      */
@@ -129,6 +132,11 @@ public class ModulexServiceImpl extends ServiceImpl<ModulexMapper, Modulex> impl
         return Result.OK("审核通过");
     }
 
+    @Override
+    public void setmodule(String id, String moduleId) {
+        modulexMapper.setmodule(id,moduleId);
+    }
+
 
     private void handleStatus(String id, Integer a){
         //先查字模块 先查询父id 等于 这个 id 的数据

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/tablex/controller/TablexController.java

@@ -111,6 +111,8 @@ public class TablexController extends JeecgController<Tablex, ITablexService> {
 		tablex.setVerison(1);
 		tablex.setTableStructure("CREATE TABLE '"+tablex.getTableEnName()+"' ();");
 		tablexService.save(tablex);
+		System.err.println(tablex.toString());
+		modulexService.setmodule(tablex.getId(),tablex.getModuleId());
 		return Result.OK("添加成功！");
 	}
 	
@@ -158,7 +160,7 @@ public class TablexController extends JeecgController<Tablex, ITablexService> {
 		if (!fieldxList1.isEmpty()){
 			return Result.error("该表已被关联，不能删除");
 		}
-//		tablexService.removeById(id);
+		tablexService.removeById(id);
 		return Result.OK("删除成功!");
 	}