'commit'

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

@@ -283,12 +283,10 @@ public class CollectController extends Controller {
         List<Record> listJobSheet = cm.getSheets(job_id);
         //检查是不是某张表中存在字段名称重复的情况
         for (int i = 0; i < listJobSheet.size(); i++) {
-            List<Record> list = cm.checkColumnNameDuplicate(job_id, i);
+            if (cm.checkColumnNameDuplicate(job_id, i)) {
-            if (list.size() > 0) {
                 Map map = new HashMap();
                 map.put("success", false);
                 map.put("message", "第" + (i + 1) + "个Sheet表中存在字段名称重复的情况，请检查后重新保存！");
-                map.put("list", list);
                 renderJson(map);
                 return;
             }

src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java

@@ -291,7 +291,7 @@ public class CollectModel {
      * @param sheet_index
      * @return
      */
-    public List<Record> checkColumnNameDuplicate(int job_id, int sheet_index) {
+    public boolean checkColumnNameDuplicate(int job_id, int sheet_index) {
         Set<String> blzList = getBlzColumn();//检查是不是与保留字重复
         String sql = "select column_name,count(1) as c from t_collect_job_sheet_col where job_id=? and sheet_index=? group by column_name having count(1)>1";
         List<Record> list = Db.find(sql, job_id, sheet_index);
@@ -300,7 +300,7 @@ public class CollectModel {
             int c = record.getInt("c");
             if (blzList.contains(column_name)) record.set(column_name, c + 1);
         }
-        return list;
+        return list.size() > 0;
     }
 
     public boolean checkColumnNameDuplicate(String json) {