增加创建者id跟更改者id

ruoyi-admin/src/main/java/com/ruoyi/web/controller/dragForm/CommonController.java

@@ -4,21 +4,14 @@ import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.exception.tenantdatassource.TenantDataSource;
-import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.entity.CommonEntity;
-import com.ruoyi.system.entity.DragTable;
 import com.ruoyi.system.entity.TableSql;
 import com.ruoyi.system.service.ICommonService;
 import com.ruoyi.system.service.IDragTableGroupService;
 import com.ruoyi.system.service.IDragTableService;
 import com.ruoyi.system.service.ITableSqlService;
-import org.aspectj.weaver.loadtime.Aj;
 import org.springframework.web.bind.annotation.*;
-
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import java.util.HashMap;
-import java.util.Map;
 
 @RestController
 @RequestMapping("/dragform/common")
@@ -78,6 +71,7 @@ public class CommonController extends BaseController {
     @GetMapping("/getTableList")
     public TableDataInfo queryTableList(CommonEntity commonEntity) throws TenantDataSource {
         TableSql tableSql = iTableSqlService.selectTableSqlByTSqlKey(commonEntity.getQueryMap().get("sqlkey").toString());
+        System.err.println(tableSql);
         startPage();  // 校验是否sqlserver 否执行 是执行另一种方式的分页
         return getDataTable(commonService.queryTableList2(commonEntity, tableSql));
     }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/dragForm/DragTableGroupController.java

@@ -127,10 +127,7 @@ public class DragTableGroupController extends BaseController {
     @ApiOperation(value = "删除拖拽格组")
     public AjaxResult batchRemove(@PathVariable Long[] ids)
     {
-        Boolean aBoolean = dragTableGroupService.selectDragTableGroupTableListSize(ids);
-        if(!aBoolean){
-            return   AjaxResult.error("该表格组下存在表格信息不能删除");
-        }
+        //Boolean aBoolean = dragTableGroupService.selectDragTableGroupTableListSize(ids);
         return toAjax(dragTableGroupService.deleteDragTableGroupByIds(ids));
     }
 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/DataSourceController.java

@@ -41,10 +41,8 @@ public class DataSourceController {
     /**
      * 得到当前表中的所有字段
      */
-
     @PostMapping("/getInfoTable")
     public List<TableInfo> queryTableInfo(@RequestBody Map<String, Object> map) {
         return dataSourceService.tableFieldInfo(map);
     }
-
 }

ruoyi-common/src/main/java/com/ruoyi/common/exception/tenantdatassource/TenantDataSource.java

@@ -1,7 +1,5 @@
 package com.ruoyi.common.exception.tenantdatassource;
 
-import com.ruoyi.common.core.domain.AjaxResult;
-
 /**
  * @author hanzihang
  * @date 2023/9/20 5:16

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

@@ -129,8 +129,35 @@ public class DragTableGroupServiceImpl implements IDragTableGroupService {
      * @return 结果
      */
     @Override
+    @Transactional
     public int deleteDragTableGroupByIds(Long[] ids)
     {
+        //表格数据
+        List<String> tableKeys = new ArrayList<>();
+        //删除条件数据
+        List<Long> dragTableIds =new ArrayList<>();
+        for (Long id : ids) {
+            //根据id查询表格组信息
+            DragTableGroup dragTableGroupOne = dragTableGroupMapper.selectDragTableGroupById(id);
+            //得到group_table_info
+            String groupTableInfo = dragTableGroupOne.getGroupTableInfo();
+            //把他转换成Map对象
+            JSONArray jsonArray = JSON.parseArray(groupTableInfo);
+            //收集tableKey
+            jsonArray.stream().forEach(item->
+                    tableKeys.add(JSONObject.parseObject(item.toString()).get("tableKey").toString()));
+            //删除条件数据
+            dragTableMapper.selectDragTableTableKeys(tableKeys)
+                    .stream().forEach(item ->dragTableIds.add(item.gettId()));
+        }
+        //删除表格数据
+        dragTableMapper.deleteDragTableByTableKeys(tableKeys);
+        //删除条件数据
+        dragTableConditionMapper.deleteDragTableConditionBytIds(dragTableIds);
+        //删除sql数据
+        Long[] dragTableIds1 = dragTableIds.toArray(new Long[0]);
+        tableSqlMapper.deleteTableSqlByTIds(dragTableIds1);
+        //删除组数据
         return dragTableGroupMapper.deleteDragTableGroupByIds(ids);
     }
 

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

@@ -374,7 +374,7 @@ public class DragTableServiceImpl implements IDragTableService {
             //insert
             List<DragTableCondition> dragTableConditionList = new ArrayList<>();
             dragTableVo.getSearchFieldList().forEach(item -> {
-                dragTableConditionList.add(new DragTableCondition(dragTableVo.gettId(), item, dragTableVo.getConditionDefaultValueMap().get(item).toString()));
+                dragTableConditionList.add(new DragTableCondition(dragTable.gettId(),item));
             });
             dragTableConditionList.forEach(e->{
                 e.setUpdateById(SecurityUtils.getUserId());

ruoyi-system/src/main/resources/mapper/dragmapper/DragTableMapper.xml

@@ -183,12 +183,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where table_key = #{tableKey}
     </select>
 
-    <select id="selectDragTableTableKeys" parameterType="list" resultMap="DragTableResult">
+    <select id="selectDragTableTableKeys" parameterType="list" resultMap="DragTableVoResult">
         SELECT
         dt.*,
         ts.table_sql,
         ts.table_export_field,
-        ts.order_by_column,
+        ts.order_by_column
         FROM drag_table dt
         LEFT JOIN table_sql ts ON dt.sql_key = ts.sql_key
         where  table_key in