Merge remote-tracking branch 'origin/main' into main

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

@@ -103,7 +103,9 @@ public class DragTableController extends BaseController {
         //新增动态表格信息
         dragTableService.addDragTable(dragTableVo);
         //新增动态表格样式
-        //dragTableStyleService.batchInsertDragTableStyle(dragTableVo);
+        if(dragTableVo.getDragTableStyleList().size() > 0){
+            dragTableStyleService.batchInsertDragTableStyle(dragTableVo);
+        }
         return AjaxResult.success();
     }
 

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

@@ -58,8 +58,10 @@ public class DragTableStyleServiceImpl implements IDragTableStyleService
     public int batchInsertDragTableStyle(DragTableVo vo)
     {
         vo.getDragTableStyleList().forEach(v -> {
+            v.setTableKey(vo.getTableKey());
             v.setCreateById(SecurityUtils.getUserId());
             v.setCreateBy(SecurityUtils.getUsername());
+            v.setCreateTime(DateUtils.getNowDate());
         });
         return dragTableStyleMapper.batchInsertDragTableStyle(vo.getDragTableStyleList());
     }
@@ -79,6 +81,7 @@ public class DragTableStyleServiceImpl implements IDragTableStyleService
         //判断新增还是修改
         vo.getDragTableStyleList().stream().forEach(s -> {
             if (s.getId() == null){
+                s.setTableKey(vo.getTableKey());
                 s.setCreateBy(SecurityUtils.getUsername());
                 s.setCreateById(SecurityUtils.getUserId());
                 s.setCreateTime(DateUtils.getNowDate());

ruoyi-system/src/main/resources/mapper/common/SysDictDataMapper.xml

@@ -21,8 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</resultMap>
 	
 	<sql id="selectDictDataVo">
-        select dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, remark 
-		from sys_dict_data
+        select dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, remark from sys_dict_data
     </sql>
 
 	<select id="selectDictDataList" parameterType="SysDictData" resultMap="SysDictDataResult">