Merge remote-tracking branch 'origin/master'

hx-xmhjc/src/main/java/com/fjhx/xmhjc/service/carousel/impl/CarouselManagerServiceImpl.java

@@ -24,10 +24,7 @@ import com.fjhx.xmhjc.entity.carousel.dto.CarouselManagerDto;
 import cn.hutool.core.bean.BeanUtil;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -116,7 +113,9 @@ public class CarouselManagerServiceImpl extends ServiceImpl<CarouselManagerMappe
         AddBrowsingDto addBrowsingDto = new AddBrowsingDto();
         if (dto.getModules().length() > 3){
             ColumnMenuVo menuDetailByOpen = columnMenuService.getMenuDetailByOpen(Long.valueOf(dto.getModules()));
-            addBrowsingDto.setName(menuDetailByOpen.getName());
+            if (Objects.nonNull(menuDetailByOpen)){
+                addBrowsingDto.setName(menuDetailByOpen.getName());
+            }
         }else {
             DictTenantDataVo dictObject = DictUtilsByOpen.getDictObject("carousel_modules", dto.getModules());
             addBrowsingDto.setName(dictObject.getDictValue());