1

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

@@ -190,8 +190,20 @@ 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());
             hashMap.put(sceneEnum.getName(),sceneNumVo);
         }
+
+        for (String key : hashMap.keySet()) {
+            SceneNumVo sceneNumVo = hashMap.get(key);
+            if(sceneNumVo.getIsObj()==0){
+                SceneNumVo sceneNumVo1 = hashMap.get(key + "_OBJ");
+                if(sceneNumVo1 != null){
+                    sceneNumVo.setSceneNum(sceneNumVo.getSceneNum() + sceneNumVo1.getSceneNum());
+                    sceneNumVo.setTotalNum(sceneNumVo.getSceneNum() + sceneNumVo.getCooperationSceneNum());
+                }
+            }
+        }
         return hashMap;
     }