Merge remote-tracking branch 'origin/master'

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

@@ -43,7 +43,10 @@ public class IDCImplDao implements IDCDao {
 
     @Override
     public List<IDCHotelEto> getHotelData() {
-        String sql = "select c.name hposition,count(1) hotelNum from hotel a left join admin_manager b on a.manager_id=b.id left join hotel_dict c on c.id = b.hotel_township  group by c.id order by count(1) DESC";
+        String sql = "select a.NAME hposition,sum(case when ifnull(c.id,0)=0 then 0 else 1 end) hotelNum from hotel_dict a\n" +
+                "left join (select * from admin_manager where status=1) b on b.hotel_township = a.id\n" +
+                "left join (select * from hotel where status=1) c on c.manager_id = b.id\n" +
+                "where a.code=10 group by a.id order by sum(case when ifnull(c.id,0)=0 then 0 else 1 end) DESC";
         List<IDCHotelEto> list = null;
         try{
             list = namedParameterJdbcTemplate.query(sql, new BeanPropertyRowMapper<>(IDCHotelEto.class));