'commit'

src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java

@@ -130,12 +130,10 @@ public class CollectController extends Controller {
     public void getSheetStruct(int job_id, int sheet_index) {
         //获取数据表的整体配置信息
         Record record = cm.getSheet(job_id, sheet_index);
-        Kv kv = Kv.create();
-        kv.set("record", record);
-
         List<Record> list = cm.getSheetStruct(job_id, sheet_index);
-        kv.set("list", CommonUtil.renderJsonForLayUI(list));
-        renderJson(kv);
+        Map<String, Object> _map = CommonUtil.renderJsonForLayUI(list);
+        _map.put("table_name", record.getStr("table_name"));
+        renderJson(_map);
     }
 
     /**
@@ -249,14 +247,15 @@ public class CollectController extends Controller {
         cm.saveJob(job_id, job_name);
 
         //判断表是不是已存在
-//        List<Record> listJobSheet = cm.getJobSheet(job_id);
-//        for (Kv kv : kvList) {
-//            String tableName = kv.getStr("table_name");
-//            if (ImportExcelKit.isTableExist(tableName)) {
-//                System.out.println("表" + tableName + "已存在，不能删除，程序无法继续！");
-//                return;
-//            }
-//        }
+        List<Record> listJobSheet = cm.getJobSheet(job_id);
+        for (Record record : listJobSheet) {
+            String tableName = record.getStr("table_name");
+            if (ImportExcelKit.isTableExist(tableName)) {
+                System.out.println("表" + tableName + "已存在，不能删除，程序无法继续！");
+                //Kv kv
+                return;
+            }
+        }
 
         //返回成功
         Map map = new HashMap();