修改bug

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

@@ -446,9 +446,7 @@ public class adminManagerAction extends ActionSupport implements ServletRequestA
             //冻结旗下所有民宿、账号
             if(admin.getManagerId()!=null){
                 //民宿
-                StringBuilder hotelsql = new StringBuilder("");
-                hotelsql.append(" and manager_id = '").append(admin.getManagerId()).append("'");
-                Hotel hotel = hotelService.getOen(hotelsql.toString());
+                Hotel hotel = hotelService.getByManagerId(admin.getManagerId());
                 if(hotel!=null){
                     hotel.setStatus(0);
                     hotelService.updateHotel(hotel);
@@ -458,9 +456,11 @@ public class adminManagerAction extends ActionSupport implements ServletRequestA
                 managersql.append(" and manager_id = '").append(admin.getManagerId()).append("'");
                 managersql.append(" and level = 1 ");
                 List<AdminManager> managerList = adminManagerService.queryList(managersql.toString());
-                for(AdminManager manager : managerList){
-                    manager.setStatus(0);
-                    adminManagerService.updateAdmin(manager);
+                if(managerList!=null){
+                    for(AdminManager manager : managerList){
+                        manager.setStatus(0);
+                        adminManagerService.updateAdmin(manager);
+                    }
                 }
             }
             resultJson.put("message", "删除成功");
@@ -524,9 +524,7 @@ public class adminManagerAction extends ActionSupport implements ServletRequestA
             //冻结旗下所有民宿、账号
             if(admin.getManagerId()!=null){
                 //民宿
-                StringBuilder hotelsql = new StringBuilder("");
-                hotelsql.append(" and manager_id = '").append(admin.getManagerId()).append("'");
-                Hotel hotel = hotelService.getOen(hotelsql.toString());
+                Hotel hotel = hotelService.getByManagerId(admin.getManagerId());
                 if(hotel!=null){
                     hotel.setStatus(2);
                     hotelService.updateHotel(hotel);
@@ -536,9 +534,11 @@ public class adminManagerAction extends ActionSupport implements ServletRequestA
                 managersql.append(" and manager_id = '").append(admin.getManagerId()).append("'");
                 managersql.append(" and level = 1 ");
                 List<AdminManager> managerList = adminManagerService.queryList(managersql.toString());
-                for(AdminManager manager : managerList){
-                    manager.setStatus(2);
-                    adminManagerService.updateAdmin(manager);
+                if(managerList!=null){
+                    for(AdminManager manager : managerList){
+                        manager.setStatus(2);
+                        adminManagerService.updateAdmin(manager);
+                    }
                 }
             }
             admin.setStatus(2);
@@ -587,9 +587,11 @@ public class adminManagerAction extends ActionSupport implements ServletRequestA
                 managersql.append(" and manager_id = '").append(admin.getManagerId()).append("'");
                 managersql.append(" and level = 1 ");
                 List<AdminManager> managerList = adminManagerService.queryList(managersql.toString());
-                for(AdminManager manager : managerList){
-                    manager.setStatus(1);
-                    adminManagerService.updateAdmin(manager);
+                if(managerList!=null){
+                    for(AdminManager manager : managerList){
+                        manager.setStatus(1);
+                        adminManagerService.updateAdmin(manager);
+                    }
                 }
             }
             admin.setStatus(1);

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

@@ -114,8 +114,9 @@ public class houseAction extends ActionSupport implements ServletRequestAware {
             int m = houseService.insertHouse(house);
             if (m > 0) {
                 for(FileInfo file : fileList){
+                    FileInfo fileInfo = fileService.getById(file.getId());
                     file.setLinkId(house.getId());
-                    if(file==null){
+                    if(fileInfo==null){
                         fileService.insertFile(file);
                     }else{
                         fileService.updateFile(file);