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

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

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