suochencheng 7 年 前
コミット
17e91b5861

+ 20 - 1
src/main/java/com/izouma/awesomeadmin/dao/HouseInfoMapper.xml

@@ -893,10 +893,29 @@
         del_flag = 'N'
         AND use_flag = 'Y'
         AND status_flag = 2
-        AND DATE_SUB(
+        AND (DATE_SUB(
         CURRENT_TIMESTAMP (),
         INTERVAL 55 MINUTE
         ) <![CDATA[ >= ]]> begin_time
+
+        OR (
+		(
+			SELECT
+				COUNT(player_info.id)
+			FROM
+				player_info
+			WHERE
+				player_info.del_flag = 'N'
+			AND player_info.house_id = house_info.id
+			AND player_info.status_flag = 2
+		) = 0
+		AND DATE_SUB(
+			CURRENT_TIMESTAMP (),
+			INTERVAL 5 MINUTE
+		) <![CDATA[ >= ]]> begin_time
+	)
+	)
+
     </select>
 
     <resultMap id="OneHouseInfoResult" type="com.izouma.awesomeadmin.model.HouseInfo" extends="BaseResultMap">