修改bug

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

@@ -190,11 +190,12 @@ public class HotelImplDao implements HotelDao {
 //                "left join (select manager_id,hotel_township hotel_township from admin_manager group by manager_id) c on a.manager_id = c.manager_id " +
 //                "where status=1 "+sqlx;
         SqlUtil.filterKeyword(sqlx);
-        String sql = "SELECT count(*) FROM `hotel` a " +
+        String sql = "SELECT count(1) FROM `hotel` a " +
                 "left join (select manager_id,min(price) min_price from house where status=1 group by manager_id) b on a.manager_id = b.manager_id " +
-                "left join (select manager_id,hotel_township hotel_township,type from admin_manager group by manager_id) c on a.manager_id = c.manager_id " +
-                "LEFT JOIN (  SELECT  id,name as hotel_township_name  FROM  hotel_dict GROUP BY  id) d ON d.id = c.hotel_township " +
-                " WHERE status=1 "+sqlx;
+                "left join (select id,manager_id,hotel_township,hotel_name,type,status from admin_manager ) c on a.manager_id = c.id " +
+                "LEFT JOIN (  SELECT  id,name as hotel_township_name,status  FROM  hotel_dict GROUP BY  id) d ON d.id = c.hotel_township " +
+                "LEFT JOIN (  SELECT  id,name as h_type_name  FROM  hotel_dict GROUP BY  id) e ON e.id = a.htype      " +
+                " WHERE hstatus = 1 and a.status=1 and c.status = 1 "+sqlx;
         MapSqlParameterSource sps = new MapSqlParameterSource();
         return namedParameterJdbcTemplate.queryForInt(sql, sps);
     }

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

@@ -49,6 +49,8 @@ public class UserDaoImpl implements UserDao {
         sps.addValue("live_hotel", users.getLive_hotel());
         if(users.getId()==0){
             sps.addValue("id", UUIDUtil.generateID());
+        }else{
+            sps.addValue("id", users.getId());
         }
         int num = 0;
         try{

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

@@ -41,7 +41,11 @@ public class UserVisitsDaoImpl implements UserVisitsDao {
         String sql = "insert into `user_visits`(id,userid,create_time,type,remark) " +
                 "values(:id,:userid,:create_time,:type,:remark) ";
         MapSqlParameterSource sps = new MapSqlParameterSource();
-        sps.addValue("id", userVisits.getId());
+        if(userVisits.getId()==0){
+            sps.addValue("id", UUIDUtil.generateID());
+        }else{
+            sps.addValue("id", userVisits.getId());
+        }
         sps.addValue("userid", userVisits.getUserid());
         sps.addValue("create_time", UUIDUtil.getNewDate());
         sps.addValue("type", userVisits.getType());