新增民宿维护时判断不为空

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

@@ -192,6 +192,7 @@ public class adminManagerAction extends ActionSupport implements ServletRequestA
             hotel.setManagerId(admin.getManagerId());
             hotel.setHname(admin.getHotelName());
             hotel.setStatus(1);
+            hotel.setHstatus(2);
             int i = hotelService.insertHotel(hotel);
             //endregion
             if (m > 0 && i > 0) {

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

@@ -124,11 +124,11 @@ public class hotelAction extends ActionSupport implements ServletRequestAware {
                     }
                 }
                 //判断是否修改简介
-                if (!hotel1.getRemark().equals(hotel.getRemark())){
+                if (hotel1.getRemark() != null && !hotel1.getRemark().equals(hotel.getRemark())){
                     isOk = true;
                 }
                 //判断是否修改了封面图
-                if (!hotel1.getCoverImg().equals(hotel.getCoverImg()) && hotel.getCoverImg() != null && !"".equals(hotel.getCoverImg())){
+                if (hotel1.getCoverImg() != null && !hotel1.getCoverImg().equals(hotel.getCoverImg()) && hotel.getCoverImg() != null && !"".equals(hotel.getCoverImg())){
                     isOk = true;
                 }
                 //判断是否修改图片