瀏覽代碼

fix 修改无HR子字段时不显示

Administrator 4 年之前
父節點
當前提交
a529c54d91

+ 1 - 0
boman-modules/boman-gen/src/main/java/com/boman/gen/service/GenTableServiceImpl.java

@@ -630,6 +630,7 @@ public class GenTableServiceImpl implements IGenTableService {
             }
         }
         String isMenu = genTable.getIsMenu();
+        //是新增
         if (StringUtils.isNotBlank(isMenu) && isMenu.equals(UserConstants.ISMENU)) {
             SysMenu sysMenu = new SysMenu();
             sysMenu.setSysTableName(tableName);

+ 19 - 1
boman-web-core/src/main/java/com/boman/web/core/service/TableServiceCmdService.java

@@ -42,6 +42,7 @@ import javax.annotation.Resource;
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Iterator;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Predicate;
@@ -359,7 +360,7 @@ public class TableServiceCmdService {
             }
         }
         JSONObject result = new JSONObject();
-        result.put(SHOW_DATA, parentColumns);
+        result.put(SHOW_DATA, removeHr(parentColumns));
         result.put(BUTTON_LIST, getButton(tableName));
         Integer tableColumn = genTable.getTableColumn();
         if (tableColumn != null){
@@ -368,6 +369,23 @@ public class TableServiceCmdService {
         return AjaxResult.success(result);
     }
 
+    /**
+     * 判断hr字段里面是否有值
+     * @param parentColumns
+     * @return
+     */
+    private List<GenTableColumn> removeHr(List<GenTableColumn> parentColumns){
+        Iterator<GenTableColumn> iterator = parentColumns.iterator();
+        while (iterator.hasNext()){
+            GenTableColumn next = iterator.next();
+            List<GenTableColumn> hrChildren = next.getHrChildren();
+            if (hrChildren.size() == 0){
+                iterator.remove();
+            }
+        }
+        return parentColumns;
+    }
+
     /**
      * 功能描述: 获取表单查询字段、按钮、表头
      * 注意: 都是从redis中拿的,如果数据库和redis不一致,则需刷新一下redis