新增民宿商家bug修改

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

@@ -104,7 +104,7 @@ public class adminManagerAction extends ActionSupport implements ServletRequestA
             }else{
                 //是否主账号首次登录
                 Hotel hotel = hotelService.getOen("and manager_id = "+login.getManagerId()+"");
-                if(hotel==null && "2".equals(login.getLevel())){
+                if(hotel.getHposition()==null && "2".equals(login.getLevel())){
                     resultJson.put("isLogin",1);
                 }else{
                     resultJson.put("isLogin",0);
@@ -190,7 +190,7 @@ public class adminManagerAction extends ActionSupport implements ServletRequestA
             //region 往hotel表中插入一条数据关联admin_manager
             Hotel hotel = new Hotel();
             hotel.setManagerId(admin.getManagerId());
-            hotel.setHotel_name(admin.getHotelName());
+            hotel.setHname(admin.getHotelName());
             hotel.setStatus(1);
             int i = hotelService.insertHotel(hotel);
             //endregion

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

@@ -260,7 +260,9 @@ public class hotelAction extends ActionSupport implements ServletRequestAware {
                 hotel.setHconfig(hotelDictService.setConfig(hotel.getHconfig()));
             }
             hotel.setRoomNumber(houseService.getHouseSum(managerId));
-            hotel.sethTypeName(hotelDictService.getDictNameById(Integer.parseInt(hotel.getHtype())));
+            if (!"".equals(hotel.getHtype()) && hotel.getHtype() !=null) {
+                hotel.sethTypeName(hotelDictService.getDictNameById(Integer.parseInt(hotel.getHtype())));
+            }
             BeanUtils.copyProperties(hotel,hotelEto);
             hotelEto.setHotelTownshipName(adminManager.getHotelTownshipName());
             StringBuilder fileSqlx = new StringBuilder("");