Administrator 4 years ago
parent
commit
ab60f74472

+ 7 - 0
boman-modules/boman-gen/src/main/java/com/boman/gen/mapper/GenTableColumnMapper.java

@@ -27,6 +27,13 @@ public interface GenTableColumnMapper
      */
     public List<GenTableColumn> selectGenTableColumnListByTableId(Long tableId);
 
+    /**
+     * 查询所有是输入或者显示的字段
+     * @param tableId
+     * @return
+     */
+    public List<GenTableColumn> selectGenTableColumnIsListByTableId(Long tableId);
+
     /**
      * 查询字段列表
      * @param genTableColumn

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

@@ -171,8 +171,10 @@ public class GenTableColumnServiceImpl implements IGenTableColumnService {
         } else if (BusinessType.DELETE.equals(type)) {
             sb.append(" DROP ").append(genTableColumn.getColumnName()).append(";");
         }
-        tableSql.setCreateLog(sb.toString());
-        tableSqlMapper.updateTableSql(tableSql);
+        if (tableSql != null) {
+            tableSql.setCreateLog(sb.toString());
+            tableSqlMapper.updateTableSql(tableSql);
+        }
     }
 
     /**
@@ -181,10 +183,12 @@ public class GenTableColumnServiceImpl implements IGenTableColumnService {
      * @param genTableColumn
      */
     public void isAk(GenTableColumn genTableColumn) {
+
         //是否是输入
         String isIn = genTableColumn.getIsIn();
         //是否是显示
         String isOut = genTableColumn.getIsOut();
+        //查询出该表所有是输入或者是显示的字段
         List<GenTableColumn> genTableColumns = genTableColumnMapper.selectGenTableColumnListByTableId(genTableColumn.getTableId());
         GenTable genTable = new GenTable();
         if (UserConstants.YES.equals(isIn)) {

+ 6 - 0
boman-modules/boman-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml

@@ -50,6 +50,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by sort
     </select>
 
+    <select id="selectGenTableColumnIsListByTableId" parameterType="GenTableColumn" resultMap="GenTableColumnResult">
+        <include refid="selectGenTableColumnVo"/>
+        where table_id = #{tableId}
+        order by sort
+    </select>
+
     <select id="selectGenTableColumnList" parameterType="GenTableColumn" resultMap="GenTableColumnResult">
         <include refid="selectGenTableColumnVo"/>
         <where>