Merge branch 'develop_master' into 'FOTON'

Develop master See merge request LiuChao/foton-slrs-system-rest!360
2022-01-07 10:33:54 +08:00
parent 12373a02eb 3f6cb25ed7
commit 32e78adaab
1 changed files with 8 additions and 2 deletions
@@ -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);
                                });
                    }
                }
            }