buttonList

boman-modules/boman-system/src/main/java/com/boman/system/common/TableServiceCmdService.java

@@ -12,10 +12,10 @@ import com.boman.gen.controller.MyController;
 import com.boman.gen.domain.GenTable;
 import com.boman.gen.domain.GenTableColumn;
 import com.boman.gen.domain.GenTableRelation;
-import com.boman.gen.service.IGenTableColumnService;
 import com.boman.system.domain.SysDictData;
 import com.boman.system.service.*;
 import com.boman.system.utils.IdUtils;
+import com.google.common.base.Strings;
 import com.google.common.collect.Lists;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -55,8 +55,6 @@ public class TableServiceCmdService {
     private  RestTemplate restTemplate;
     @Resource
     private  ISysDictTypeService dictTypeService;
-    @Resource
-    private IGenTableColumnService tableColumnService;
 
     private static final Logger LOGGER = LoggerFactory.getLogger(TableServiceCmdService.class);
 
@@ -283,7 +281,7 @@ public class TableServiceCmdService {
 
         jsonObject.put(FormDataConstant.QUERY_LIST, queryList);
         // genTable.getMenuRole() 暂时数据库没有数据，
-        jsonObject.put(FormDataConstant.BUTTON_LIST, genTable.getMenuRole());
+        jsonObject.put(FormDataConstant.BUTTON_LIST, Strings.nullToEmpty(genTable.getMenuRole()));
 
         // 表头
         List<GenTableColumn> tableHeadList = columns.stream()
@@ -331,7 +329,7 @@ public class TableServiceCmdService {
 
         for (GenTableRelation relation : relations) {
             if (relation.getRelationChildId().equals(6L)) {
-                tableColumnService.selectGenTableColumnListByTableId(childTableTableId);
+               // tableColumnService.selectGenTableColumnListByTableId(childTableTableId);
 //                return
             }
         }