Merge remote-tracking branch 'origin/master'

sms_water/src/main/java/com/huaxu/controller/CameraManageController.java

@@ -94,13 +94,13 @@ public class CameraManageController {
     @ApiOperation(value = "查询摄像头列表")
     public AjaxMessage<Pagination<CameraManage>> selectPage(@RequestParam(required = false) Integer pageNum,
                                                             @RequestParam(required = false)Integer pageSize,
-                                                            @RequestParam(required = false) Integer companyId,
-                                                            @RequestParam(required = false)Integer departMentId,
+                                                            @RequestParam(required = false) Integer companyOrgId,
+                                                            @RequestParam(required = false)Integer deptOrgId,
                                                             @RequestParam(required = false) Integer sceneId,
                                                             @RequestParam(required = false) String name) {
         CameraManage cameraManage = new CameraManage();
-        cameraManage.setCompanyOrgId(companyId);
-        cameraManage.setDeptOrgId(departMentId);
+        cameraManage.setCompanyOrgId(companyOrgId);
+        cameraManage.setDeptOrgId(deptOrgId);
         cameraManage.setSceneId(sceneId);
         cameraManage.setName(name);
         IPage<CameraManage> iPage = new Page<>(pageNum, pageSize);

sms_water/src/main/resources/mapper/CameraManageMapper.xml

@@ -169,6 +169,9 @@
             <if test="deptOrgId != null">
                 DEPT_ORG_ID = #{deptOrgId},
             </if>
+            <if test="deptOrgId == null">
+                DEPT_ORG_ID =null,
+            </if>
             <if test="sceneId != null">
                 SCENE_ID = #{sceneId},
             </if>
@@ -181,7 +184,7 @@
             <if test="palyUrl != null and palyUrl != ''">
                 PALY_URL = #{palyUrl},
             </if>
-            <if test="replayUrl != null and replayUrl != ''">
+            <if test="replayUrl != null ">
                 REPLAY_URL = #{replayUrl},
             </if>
             <if test="appkey != null and appkey != ''">