Merge branch 'master' of https://e.coding.net/chuanghaikeji/jinganxiangsu/Homestay_app_houtai

mhotel/src/com/happy/action/hotelAction.java

@@ -21,7 +21,9 @@ import org.springframework.beans.BeanUtils;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
 
 public class hotelAction extends ActionSupport implements ServletRequestAware {
 

mhotel/src/com/happy/dao/impl/BookingCommentImplDao.java

@@ -360,7 +360,7 @@ public class BookingCommentImplDao implements BookingCommentDao {
                 "\tLEFT JOIN ( SELECT fi.link_id, GROUP_CONCAT( fi.url ) AS url FROM file_info fi GROUP BY fi.link_id ) fi2 ON fi2.link_id = bc.id\n" +
                 "\tLEFT JOIN hotel_dict hd ON hd.id = b.hotel_township \n" +
                 "\tAND hd.`status` = 1\n" +
-                "\tLEFT JOIN ( SELECT comment_parent_id, count( 1 ) commentSum FROM booking_comment WHERE comment_parent_id IS NOT NULL GROUP BY comment_id AND `status` = 1 ) cc ON bc.id = cc.comment_parent_id\n" +
+                "\tLEFT JOIN ( SELECT comment_parent_id, count( 1 ) commentSum FROM booking_comment WHERE comment_parent_id IS NOT NULL  AND `status` = 1 GROUP BY comment_parent_id ) cc ON bc.id = cc.comment_parent_id\n" +
                 "\tWHERE bc.`status`=1 and bc.id= :bookingCommentId";
         MapSqlParameterSource sps = new MapSqlParameterSource();
         sps.addValue("bookingCommentId", bookingCommentId);