fix:修复批量导入插入问题

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

@@ -236,7 +236,7 @@ public class CommonFileController {
                     listMap.add(0, map);
                 }
             });
-            if (listMap.get(0).size() != listMap.get(2).size()) {
+            if (listMap.get(0).size() != listMap.get(1).size()) {
                 return AjaxResult.error("请检查表格中的数据是否正确！");
             }
             listMap.get(0).forEach((mKey, mVal) -> {

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

@@ -45,9 +45,11 @@ public class CommonServiceImpl implements ICommonService {
     public int batchInsert(CommonEntity commonEntity) {
         String tableName = (String) commonEntity.getBasicMap().get("tableName");
         List<Map<String, String>> list = commonEntity.getAddListMap();
-        list.get(0).put("create_time", DateUtils.getTime());
-        list.get(0).put("create_by", SecurityUtils.getUsername());
-        list.get(0).put("del_flag", "0");
+        list.forEach(item -> {  // 批量导入数据给导入数据增加默认值
+            item.put("create_time", DateUtils.getTime());
+            item.put("create_by", SecurityUtils.getUsername());
+            item.put("del_flag", "0");
+        });
         List<Map<String, Object>> mapList = new ArrayList<>();
         for (Object obj : list) {
             Map<String, Object> map1 = (Map<String, Object>) obj;

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

@@ -268,7 +268,7 @@ public class DragTableServiceImpl implements IDragTableService {
                 break;
         }
         String where = dragTableVo.getDtTableName() + ".del_flag = '0' AND ";
-        tableSql.setTableCondition(where = SQL + SQL_END);
+        tableSql.setTableCondition(where + SQL + SQL_END);
         tableSql.setTableAlias(dragTableVo.getDtTableName());
         tableSql.setSqlKey(dragTableVo.getSqlKey());
         tableSql.setTableExportField(JSON.toJSONString(dragTableVo.getTableExportField()));