1

src/main/java/com/fdkankan/ucenter/common/SceneEnum.java

@@ -38,11 +38,11 @@ public enum SceneEnum {
         this.sceneSource = sceneSource;
     }
 
-    public Integer getObj() {
+    public Integer getIsObj() {
         return isObj;
     }
 
-    public void setObj(Integer obj) {
+    public void setIsObj(Integer obj) {
         isObj = obj;
     }
 

src/main/java/com/fdkankan/ucenter/service/impl/SceneProServiceImpl.java

@@ -190,13 +190,13 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             sceneNumVo.setSceneNum( sceneNumVo.getSceneNum() + vo.getSceneNum() );
             sceneNumVo.setCooperationSceneNum( sceneNumVo.getCooperationSceneNum() + vo.getCooperationSceneNum() );
             sceneNumVo.setTotalNum(sceneNumVo.getSceneNum() + sceneNumVo.getCooperationSceneNum());
-            sceneNumVo.setIsObj(sceneEnum.getObj());
+            sceneNumVo.setIsObj(sceneEnum.getIsObj());
             hashMap.put(sceneEnum.getName(),sceneNumVo);
         }
 
         for (String key : hashMap.keySet()) {
             SceneNumVo sceneNumVo = hashMap.get(key);
-            if(sceneNumVo.getIsObj()==0){
+            if(sceneNumVo.getIsObj() != null && sceneNumVo.getIsObj()==0){
                 SceneNumVo sceneNumVo1 = hashMap.get(key + "_OBJ");
                 if(sceneNumVo1 != null){
                     sceneNumVo.setSceneNum(sceneNumVo.getSceneNum() + sceneNumVo1.getSceneNum());