lvzhikai il y a 4 ans
Parent
commit
f98fc4a1ac

+ 3 - 1
src/main/java/com/chinaitop/depot/basic/controller/MonitorCameraController.java

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