修改问题

src/main/java/com/chinaitop/depot/basic/controller/MonitorCameraController.java

@@ -91,6 +91,8 @@ public class MonitorCameraController {
 
         criteria.andOrgIdEqualTo(orgid.toString());//添加组织
 
+        example.setOrderByClause("update_time DESC");
+
         if (pageNum!=null && pageSize!=null) {
             PageHelper.startPage(pageNum, pageSize);
         }
@@ -153,7 +155,7 @@ public class MonitorCameraController {
         cameraStorehouseService.deleteById(camera.getId());
         if(camera.getLive().equals("1")) {//只有仓内摄像头才关联仓房信息
         	//保存摄像头仓房管理信息
-        	if(!camera.getStorehouseId().isEmpty()) {
+        	if(!(camera.getStorehouseId() == null)) {
         		cameraStorehouseService.add(camera);
         	}
         }