Merge remote-tracking branch 'origin/develop_master' into develop_master

2022-01-07 10:52:22 +08:00
parent bc57848bdf 3f6cb25ed7
commit 12a9e4db39
1 changed files with 8 additions and 2 deletions
@@ -287,7 +287,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
        if (null != page.getNowOrderBy()) {
            nowOrderFunc(page);
        }
-        
+
        List<SarBussionessStand> getList = sarBussionessStandEODao.getSarBussionessStand(page);
        attrInfoShowExport(getList);
        return getList;
@@ -830,7 +830,13 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                        value = entry.getValue().toString();
                        List<String> valArr = Arrays.asList(value.split(","));
                        value = dicTypeEODao.getDicNamesByCodes(valArr);
-                        entry.setValue(value);
+
+                        Optional.ofNullable(value)
+                                .ifPresent(val->{
+                                    entry.setValue(val);
+                                });
+
+
                    }
                }
            }