1

src/main/resources/mapper/agent/CameraIncrementLogMapper.xml

@@ -7,7 +7,7 @@
         from t_camera_increment_log cil
             left join t_camera c on cil.camera_id = c.id
             left join t_camera_detail d on c.id = d.camera_id
-            left join t_user_increment ui on cil.increment_id = ui.id
+            left join t_user_increment ui on cil.increment_id = ui.id and ui.rec_status = 'A'
             left join t_user u on cil.operation_user = u.id
             left join t_increment_type uit on ui.increment_type_id = uit.id
             where cil.rec_status = 'A'
@@ -39,8 +39,8 @@
         <if test="param.operationUserName != null and param.operationUserName !=''">
             and u.user_name like concat ('%',#{param.operationUserName},'%')
         </if>
-        <if test="param.operationUserName != null and param.operationUserName !=''">
-            and u.user_name like concat ('%',#{param.operationUserName},'%')
+        <if test="param.operationUserName != null and param.operationUserName =='平台'">
+            and u.user_name is null
         </if>
         <if test="param.startTime!= null and param.startTime != ''">
             and cil.create_time BETWEEN #{param.startTime} and #{param.endTime}

src/main/resources/mapper/agent/CameraMapper.xml

@@ -8,8 +8,8 @@
         d.order_sn,ui.is_expired as incrementStatus,ui.increment_type_id ,ui.increment_end_time
         from t_camera c
         left join t_camera_detail d on c.id = d.camera_id
-        left join t_user u on d.user_id = u.id
-        left join t_user_increment ui on d.camera_id = ui.camera_id
+        left join t_user u on d.user_id = u.id and u.rec_status = 'A'
+        left join t_user_increment ui on d.camera_id = ui.camera_id and ui.rec_status = 'A'
         where c.rec_status = 'A'
         <if test="param.userId !=null ">
             and d.user_id = #{param.userId}