handleNullColumn getObject

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

@@ -240,7 +240,7 @@ public class TableServiceCmdService {
         result = filter(result, ObjectUtils::isNotEmpty);
 
         // 查询时为null的列不显示的处理
-        handleNullColumn(result, showData);
+        handleNullColumnValue(result, showData);
 
         // 处理blob
         handleBlob(result, genTable.getIsContainsBlob());
@@ -280,6 +280,8 @@ public class TableServiceCmdService {
 
         List<JSONObject> jsonList = selectService.selectByIdList(tableName, pkName, Lists.newArrayList(id), showData);
         requireNonNull(jsonList, "id 为[" + id + "]的数据不存在, 模块为[" + genTable.getFunctionName() + "]");
+        // 查询时为null的列不显示的处理
+        handleNullColumnValue(jsonList, showData);
         JSONObject json = jsonList.get(0);
 
         // 处理blob
@@ -320,7 +322,6 @@ public class TableServiceCmdService {
                     children.add(column);
                 }
             }
-//            handleNullTableColumn(children, showData);
             hrColumn.setHrChildren(children);
         }
 

boman-web-core/src/main/java/com/boman/web/core/utils/HandlerFormDataUtils.java

@@ -198,7 +198,7 @@ public class HandlerFormDataUtils {
      * @param result   result
      * @param showData showData
      */
-    public static void handleNullColumn(List<JSONObject> result, JSONArray showData) {
+    public static void handleNullColumnValue(List<JSONObject> result, JSONArray showData) {
         for (JSONObject jsonObject : result) {
             Set<String> resultKeySet = jsonObject.keySet();
             for (Object columnNameObj : showData) {
@@ -216,12 +216,12 @@ public class HandlerFormDataUtils {
      * @param result   result
      * @param showData showData
      */
-    public static void handleNullTableColumn(List<GenTableColumn> result, List<String> showData) {
-        List<String> dbColumnNameList = map(result, GenTableColumn::getColumnName);
-        for (GenTableColumn tableColumn : result) {
+    public static void handleNullColumnValue(List<JSONObject> result, List<String> showData) {
+        for (JSONObject jsonObject : result) {
+            Set<String> resultKeySet = jsonObject.keySet();
             for (String columnName : showData) {
-                if (!dbColumnNameList.contains(columnName)) {
-                    tableColumn.setColumnValue("");
+                if (!resultKeySet.contains(columnName)) {
+                    jsonObject.put(columnName, "");
                 }
             }
         }