fix

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

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.boman.common.core.constant.GenConstants;
 import com.boman.common.core.utils.SecurityUtils;
+import com.boman.common.core.utils.StringUtils;
 import com.boman.common.core.utils.array.ArrayUtils;
 import com.boman.common.core.utils.collection.CollectionUtils;
 import com.boman.common.core.utils.obj.ObjectUtils;
@@ -291,6 +292,9 @@ public class TableServiceCmdService {
         // 处理blob
         handleBlob(jsonList, genTable.getIsContainsBlob());
         List<GenTableColumn> parentColumns = filterHrAndSort(columns);
+
+        //接收可能存在的cssClass
+        String cssClass = null;
         // 处理成hr的形式
         for (GenTableColumn hrColumn : parentColumns) {
             List<GenTableColumn> children = Lists.newArrayListWithCapacity(16);
@@ -306,18 +310,14 @@ public class TableServiceCmdService {
                         if (isNotEmpty(dictType)) {
                             String value = json.getString(columnName);
                             List<SysDictData> sysDictData = column.getSysDictData();
-                            if(sysDictData.size() > 0){
+                            if (sysDictData != null && sysDictData.size() > 0) {
                                 for (SysDictData sysDictDatum : sysDictData) {
                                     if (sysDictDatum.getDictValue().equals(value)) {
-                                        String cssClass = sysDictDatum.getCssClass();
-                                        //给前端一个表示,来展示图片
-                                        column.setCssClass(cssClass);
+                                        cssClass = sysDictDatum.getCssClass();
                                         break;
                                     }
                                 }
                             }
-/*                            // 既要sysDictData还得要columnValue
-                            column.setSysDictData(listSysDictDataByType(dictType));*/
                         }
                         // dateTime
                         if (NEED_CONVERT_DATE_LIST.contains(columnType)) {
@@ -340,6 +340,12 @@ public class TableServiceCmdService {
             hrColumn.setHrChildren(children);
         }
 
+        //给基本属性和日志信息添加上cssClass
+        if (StringUtils.isNotBlank(cssClass)){
+            for (GenTableColumn parentColumn : parentColumns) {
+                parentColumn.setCssClass(cssClass);
+            }
+        }
         JSONObject result = new JSONObject();
         result.put(SHOW_DATA, parentColumns);
         result.put(BUTTON_LIST, getButton(tableName));

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

@@ -58,10 +58,12 @@ public class HandlerFormDataUtils {
                         List<SysDictData> sysDictData = column.getSysDictData();
                         //获取到字段的值
                         String value = String.valueOf(jsonObject.get(string));
-                        for (SysDictData sysDictDatum : sysDictData) {
-                            if (sysDictDatum.getDictValue().equals(value)) {
-                                jsonObject.put(columnName, sysDictDatum.getDictLabel());
-                                jsonObject.put("list_class", sysDictDatum.getListClass());
+                        if (sysDictData != null && sysDictData.size() > 0){
+                            for (SysDictData sysDictDatum : sysDictData) {
+                                if (sysDictDatum.getDictValue().equals(value)) {
+                                    jsonObject.put(columnName, sysDictDatum.getDictLabel());
+                                    jsonObject.put("list_class", sysDictDatum.getListClass());
+                                }
                             }
                         }
                     }