Administrator 4 жил өмнө
parent
commit
c4e6da247d

+ 6 - 6
boman-modules/boman-gen/src/main/java/com/boman/gen/controller/MyController.java

@@ -59,12 +59,12 @@ public class MyController extends BaseController {
         packTableAndInsertToRedis(tableList, genTableColumns);
 
         List<GenTableRelation> relationList = genTableRelationService.selectGenTableRelationList(new GenTableRelation());
-        requireNonNull(relationList);
-        // load gen_table_relation表数据到redis
-        redisService.setCacheObject(RedisKey.RELATION_INFO, relationList, 12L, TimeUnit.DAYS);
-
-        // load tableRelation
-        packRelationAndInsertToRedis(tableList, relationList, genTableColumns);
+        if (relationList.size() > 0) {
+            // load gen_table_relation表数据到redis
+            redisService.setCacheObject(RedisKey.RELATION_INFO, relationList, 12L, TimeUnit.DAYS);
+            // load tableRelation
+            packRelationAndInsertToRedis(tableList, relationList, genTableColumns);
+        }
         return AjaxResult.success(tableList);
     }
 

+ 7 - 5
boman-modules/boman-gen/src/main/java/com/boman/gen/service/TableSqlServiceImpl.java

@@ -132,11 +132,13 @@ public class TableSqlServiceImpl implements ITableSqlService {
         sb.append(tableName).append(" (\r\n");
 
         for (GenTableColumn genTableColumn : genTableColumns) {
-            sb.append(genTableColumn.getColumnName()).append(" ").append(genTableColumn.getColumnType());
-            sb = genTableColumn.getDefaultValue() == null ? sb.append(" DEFAULT NULL COMMENT ") : sb.append(" DEFAULT '").append(genTableColumn.getDefaultValue()).append("' COMMENT '");
-            sb.append(genTableColumn.getColumnComment()).append("'").append(",\r\n");
-            if (genTableColumn.getIsPk().equals(UserConstants.INCREMENT)) {
-                primaryKey = genTableColumn.getColumnName();
+            if (!"HR".equals(genTableColumn.getHtmlType())){
+                sb.append(genTableColumn.getColumnName()).append(" ").append(genTableColumn.getColumnType());
+                sb = genTableColumn.getDefaultValue() == null ? sb.append(" DEFAULT NULL COMMENT ") : sb.append(" DEFAULT '").append(genTableColumn.getDefaultValue()).append("' COMMENT '");
+                sb.append(genTableColumn.getColumnComment()).append("'").append(",\r\n");
+                if (genTableColumn.getIsPk().equals(UserConstants.INCREMENT)) {
+                    primaryKey = genTableColumn.getColumnName();
+                }
             }
         }
         if (StringUtils.isNotBlank(primaryKey)) {