1

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

@@ -128,7 +128,7 @@
     </select>
 
 
-    <select id="getCountByAndIsObj" resultType="com.fdkankan.ucenter.entity.ScenePlus">
+    <select id="getCountByAndIsObj" resultType="java.lang.Long">
         SELECT
         (select count(s.id) from t_scene_plus s LEFT JOIN t_scene_plus_ext e on s.id = e.plus_id
         WHERE s.rec_status = 'A' and s.user_id = #{userId}
@@ -144,7 +144,7 @@
         )
         +
         (select count(s.id) from t_scene_pro s
-        WHERE s.rec_status = 'A' and s.user_id = #{userId}
+        WHERE s.rec_status = 'A' and s.user_id = #{userId} and is_upgrade = 0
         <if test="sceneSourceList !=null and sceneSourceList.size >0">
             and s.scene_source in
             <foreach collection="sceneSourceList" item="sceneSource" open="(" separator="," close=")">
@@ -154,7 +154,7 @@
         <if test="isObj != null and isObj==1 and isLaser ==1 ">
             and s.is_obj = 1
         </if>
-        )
+        ) as total
     </select>
 
     <select id="pageLaserScene" resultType="com.fdkankan.ucenter.vo.RelicsSceneInitQueueDTO">