fix:表格样式非空校验，表格组新增条件默认值

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

@@ -99,13 +99,14 @@ public class DragTableController extends BaseController {
      * 新增动态表格模版数据
      */
     @PostMapping("/addDragTable")
-    public AjaxResult addDragTable(@RequestBody DragTableVo dragTableVo){
+    public AjaxResult addDragTable(@RequestBody DragTableVo dragTableVo) {
         //新增动态表格信息
         dragTableService.addDragTable(dragTableVo);
         //新增动态表格样式
-        if(dragTableVo.getDragTableStyleList().size() > 0){
-            dragTableStyleService.batchInsertDragTableStyle(dragTableVo);
-        }
+        if (dragTableVo.getDragTableStyleList() != null)
+            if (dragTableVo.getDragTableStyleList().size() > 0) {
+                dragTableStyleService.batchInsertDragTableStyle(dragTableVo);
+            }
         return AjaxResult.success();
     }
 
@@ -133,11 +134,11 @@ public class DragTableController extends BaseController {
      * 删除动态表格
      */
     @DeleteMapping("/remove")
-    public AjaxResult remove(@RequestBody Map<String,Object> map) {
+    public AjaxResult remove(@RequestBody Map<String, Object> map) {
         List<Long> tIds = (List<Long>) map.get("tIds");
         List<String> sqlKeys = (List<String>) map.get("sqlKeys");
-        List<String> tableKeys = (List<String>)map.get("tableKeys");
-        dragTableService.deleteDragTable(tIds,sqlKeys);
+        List<String> tableKeys = (List<String>) map.get("tableKeys");
+        dragTableService.deleteDragTable(tIds, sqlKeys);
         dragTableStatisticService.deleteDragTableStatisticByTableKeys(tableKeys);
         dragTableStyleService.deleteDragTableStyleByTableKeys(tableKeys);
         return AjaxResult.success();

ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/SqlInterceptor.java

@@ -65,7 +65,6 @@ public class SqlInterceptor implements Interceptor {
             } else {
                 if (sql.contains("information_schema")) return sql;  // 执行当前sql不需要选择数据源
                 StringBuilder sb = new StringBuilder(sql);
-
                 if (sb.indexOf(" from ") != -1) {
                     sb.insert(sb.indexOf(" from ") + 6, "`" + SecurityUtils.getDatabaseName() + "`.");  // 在目标字符后插入新的字符串
                 } else if (sb.indexOf(" FROM ") != -1) {

ruoyi-system/src/main/java/com/ruoyi/system/entity/DragTableCondition.java

@@ -125,9 +125,10 @@ public class DragTableCondition extends BaseEntity {
     public DragTableCondition() {
     }
 
-    public DragTableCondition(Long tId, String conditionField) {
+    public DragTableCondition(Long tId, String conditionField, String conditionDefaultValue) {
         this.tId = tId;
         this.conditionField = conditionField;
+        this.conditionDefaultValue = conditionDefaultValue;
     }
 
     public DragTableCondition(Long tcId, Long tId, String conditionName, String conditionField, String conditionNotes, String conditionType, String conditionDefaultValue, Long sort, String conditionTableName, String conditionTableFieldName, String conditionTableFieldKey, String conditionDatasource, String componentType, String componentSize, String componentIcon, String isHidden, String delFlag, List<Map<String, Object>> dropDownList) {

ruoyi-system/src/main/java/com/ruoyi/system/entity/vo/DragTableVo.java

@@ -8,6 +8,8 @@ import com.ruoyi.system.entity.TableSql;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -73,6 +75,11 @@ public class DragTableVo {
      */
     private List<String> searchFieldList;
 
+    /**
+     * sql语句默认值
+     */
+    private Map<String, Object> conditionDefaultValueMap;
+
     /**
      * 表查询语句
      */
@@ -112,13 +119,19 @@ public class DragTableVo {
      */
     private String sortOrder;
 
-    /** 表格统计 */
+    /**
+     * 表格统计
+     */
     private List<DragTableStatistic> dragTableStatisticList;
 
-    /** table sql List */
+    /**
+     * table sql List
+     */
     private List<TableSql> tableSqlList;
 
-    /** 表格样式 */
+    /**
+     * 表格样式
+     */
     private List<DragTableStyle> dragTableStyleList;
 
     public Long gettId() {
@@ -297,10 +310,22 @@ public class DragTableVo {
         this.dragTableStyleList = dragTableStyleList;
     }
 
+    public Map<String, Object> getConditionDefaultValueMap() {
+
+        if (conditionDefaultValueMap == null) {
+            conditionDefaultValueMap = new HashMap<>();
+        }
+        return conditionDefaultValueMap;
+    }
+
+    public void setConditionDefaultValueMap(Map<String, Object> conditionDefaultValueMap) {
+        this.conditionDefaultValueMap = conditionDefaultValueMap;
+    }
+
     public DragTableVo() {
     }
 
-    public DragTableVo(Long tId, String dtName, String dtNickname, String tableKey, String sqlKey, String dtTableName, Object dtColumnName, String dtColumnNameEcho, String timeFormat, String isSelection, List<String> searchFieldList, String tableSql, Object tableExportField, String tableExportFieldEcho, String echoData, Long menuId, String primaryKey, String orderByColumn, String sortOrder, List<DragTableStatistic> dragTableStatisticList, List<TableSql> tableSqlList,List<DragTableStyle> dragTableStyleList) {
+    public DragTableVo(Long tId, String dtName, String dtNickname, String tableKey, String sqlKey, String dtTableName, Object dtColumnName, String dtColumnNameEcho, String timeFormat, String isSelection, List<String> searchFieldList, Map<String, Object> conditionDefaultValueMap, String tableSql, Object tableExportField, String tableExportFieldEcho, String echoData, Long menuId, String primaryKey, String orderByColumn, String sortOrder, List<DragTableStatistic> dragTableStatisticList, List<TableSql> tableSqlList, List<DragTableStyle> dragTableStyleList) {
         this.tId = tId;
         this.dtName = dtName;
         this.dtNickname = dtNickname;
@@ -312,6 +337,7 @@ public class DragTableVo {
         this.timeFormat = timeFormat;
         this.isSelection = isSelection;
         this.searchFieldList = searchFieldList;
+        this.conditionDefaultValueMap = conditionDefaultValueMap;
         this.tableSql = tableSql;
         this.tableExportField = tableExportField;
         this.tableExportFieldEcho = tableExportFieldEcho;

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

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