Merge branch 'test'

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

@@ -181,7 +181,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         }
 
         for (SceneNumVo vo : groupBySceneSouceV4) {
-            SceneEnum sceneEnum = SceneEnum.getBySceneSource(vo.getType(), vo.getIsObj());
+                SceneEnum sceneEnum = SceneEnum.getBySceneSource(vo.getType(), vo.getIsObj());
             if(sceneEnum == null || sceneEnum.getObj() ==0){
                 continue;
             }

src/main/resources/mapper/ucenter/SceneCooperationMapper.xml

@@ -23,18 +23,19 @@
     </select>
 
     <select id="getGroupCooperationSceneProNum" resultType="com.fdkankan.ucenter.vo.response.SceneNumVo">
-        SELECT scene_source as type,count(0) as cooperationSceneNum FROM t_scene_cooperation a
+        SELECT scene_source as type,count(0) as cooperationSceneNum,is_obj FROM t_scene_cooperation a
         LEFT JOIN t_scene_pro b ON a.scene_num = b.num
         WHERE a.rec_status = 'A' AND b.rec_status = 'A' AND b.is_upgrade = 0
         AND a.user_id = #{userId}
-        group by scene_source
+        group by scene_source,is_obj
     </select>
     <select id="getGroupCooperationScenePlusNum" resultType="com.fdkankan.ucenter.vo.response.SceneNumVo">
-        SELECT scene_source as type,count(0) as cooperationSceneNum FROM t_scene_cooperation a
+        SELECT scene_source as type,count(0) as cooperationSceneNum ,e.is_obj FROM t_scene_cooperation a
         LEFT JOIN t_scene_plus b ON a.scene_num = b.num
+        Left Join t_scene_plus_ext e on b.id = e.plus_id
         WHERE a.rec_status = 'A' AND b.rec_status = 'A'
         AND a.user_id = #{userId}
-        group by scene_source
+        group by scene_source,is_obj
 
     </select>
 </mapper>