Merge branch '20250428首页' of http://git.dgtis.com/qxp/suishenbang-oneportal into 20250428首页

suishenbang-wxportal/suishenbang-wxportal-common/src/main/java/com/dgtly/wxportal/service/impl/WxMagnetServiceImpl.java

@@ -329,8 +329,8 @@ public class WxMagnetServiceImpl implements IWxMagnetService
         List<Map<String,Object>> iconInfos=jdbcTemplate.queryForList("select * from system_home_config ");
         Map<String,Object> iconInfo= iconInfos.size()!=0?iconInfos.get(0):null;
         if(iconInfo!=null) {
-            String smallIconString = iconInfo.get("small_icon_extra").toString();
-            String activityIconString = iconInfo.get("activity_icon_extra").toString();
+            String smallIconString = iconInfo.get("small_icon_extra")!=null?iconInfo.get("small_icon_extra").toString():"";
+            String activityIconString = iconInfo.get("activity_icon_extra")!=null?iconInfo.get("activity_icon_extra").toString():"";
             if (StringUtils.isNotBlank(smallIconString)) {
                 Map mapType = JSON.parseObject(smallIconString, Map.class);
                 iconInfo.put("smallIconObject", mapType);