lyhzzz 1 anno fa
parent
commit
1e2f6a58ab

+ 4 - 2
src/main/java/com/fdkankan/ucenter/service/impl/FusionService.java

@@ -42,8 +42,10 @@ public class FusionService implements IFusionService {
             SceneProEntityVo vo = new SceneProEntityVo();
             vo.setSceneName(scenePlusVo.getTitle());
             vo.setStatus(scenePlusVo.getSceneStatus());
-            BeanUtils.copyProperties(scenePlusVo.getPlusExt(),vo);
-            BeanUtils.copyProperties(scenePlusVo,vo);
+            if(scenePlusVo.getPlusExt() !=null){
+                BeanUtils.copyProperties(scenePlusVo.getPlusExt(),vo);
+            }
+            BeanUtils.copyProperties(scenePlusVo, vo);
             proEntityVos.add(vo);
         }
         Page<SceneProEntityVo> pageVo = new Page<>(param.getPageNum(),param.getPageSize());