fix

boman-modules/boman-gen/src/main/java/com/boman/gen/service/GenTableColumnServiceImpl.java

@@ -57,7 +57,7 @@ public class GenTableColumnServiceImpl implements IGenTableColumnService {
                 }
             }
             if (genTableColumn.getForeignKey() != null) {
-                GenTableColumn genTableColumn1 = selectGenTableColumnListByColumnId(genTableColumn.getId());
+                GenTableColumn genTableColumn1 = selectGenTableColumnListByColumnId(genTableColumn.getForeignKey());
                 genTableColumn.setForeignKeyName(genTableColumn1.getColumnName());
             }
         }
@@ -158,7 +158,7 @@ public class GenTableColumnServiceImpl implements IGenTableColumnService {
     @Override
     public void updateGenTableColumnList(List<GenTableColumn> genTableColumn) {
         isAk(genTableColumn);
-        insertCreateLog(genTableColumn,BusinessType.UPDATE);
+        insertCreateLog(genTableColumn, BusinessType.UPDATE);
         for (GenTableColumn tableColumn : genTableColumn) {
             genTableColumnMapper.updateGenTableColumn(tableColumn);
         }
@@ -201,6 +201,7 @@ public class GenTableColumnServiceImpl implements IGenTableColumnService {
      * @param genTableColumnList
      */
     public void isAk(List<GenTableColumn> genTableColumnList) {
+        GenTable genTable = new GenTable();
         for (GenTableColumn genTableColumn : genTableColumnList) {
             //是否是输入
             String isIn = genTableColumn.getIsIn();
@@ -208,7 +209,6 @@ public class GenTableColumnServiceImpl implements IGenTableColumnService {
             String isOut = genTableColumn.getIsOut();
             //查询出该表所有是输入或者是显示的字段
             List<GenTableColumn> genTableColumns = genTableColumnMapper.selectGenTableColumnIsListByTableId(genTableColumn.getTableId());
-            GenTable genTable = new GenTable();
             if (UserConstants.YES.equals(isIn)) {
                 //判断是否已经存在输入字段且不是同一个字段
                 if (genTableColumns.size() > 0) {
@@ -222,7 +222,6 @@ public class GenTableColumnServiceImpl implements IGenTableColumnService {
                 }
                 genTable.setId(genTableColumn.getTableId());
                 genTable.setAkColumn(genTableColumn.getId());
-                genTable.setDkColumn(null);
             }
             if (UserConstants.YES.equals(isOut)) {
                 //判断是否已经存在显示字段且不是同一个字段
@@ -234,18 +233,17 @@ public class GenTableColumnServiceImpl implements IGenTableColumnService {
                             break;
                         }
                     }
+                    genTable.setId(genTableColumn.getTableId());
+                    genTable.setDkColumn(genTableColumn.getId());
                 }
-                genTable.setId(genTableColumn.getTableId());
-                genTable.setDkColumn(genTableColumn.getId());
-                genTable.setAkColumn(null);
-            }
-            if (genTable.getId() != null) {
-                genTableMapper.updateGenTable(genTable);
-            } else {
-                //表明没有显示和输入字段更新到gen表上
-                genTableMapper.updateGenTableColumnNull(genTableColumn.getTableId());
             }
         }
+        if (genTable.getId() != null) {
+            genTableMapper.updateGenTable(genTable);
+        } else {
+            //表明没有显示和输入字段更新到gen表上
+            genTableMapper.updateGenTableColumnNull(genTableColumnList.get(0).getTableId());
+        }
     }