修改导出

business-service/src/main/java/com/ozs/service/entity/vo/DeviceStateResp.java

@@ -34,7 +34,7 @@ public class DeviceStateResp extends PageVo implements Serializable {
     private String lineDir;
     @Excel(name = "相机状态")
     private String isDisable;
-    @Excel(name = "电量")
+    @Excel(name = "电量（%）")
     private Integer electricity;
     @Excel(name = "相机编码")
     private String cameraCode;

business-service/src/main/resources/mapper/service/BaseCameraManagementMapper.xml

@@ -173,13 +173,13 @@
                 and
                 <trim prefix="(" prefixOverrides="or" suffix=")">
                     <if test="dsUserId != null and dsUserId != ''">
-                        or a.create_by=#{dsUserId}
+                        or ca.create_by=#{dsUserId}
                     </if>
                     <if test="dsDeptId != null and dsDeptId != 0">
-                        or a.dept_id=#{dsDeptId}
+                        or ca.dept_id=#{dsDeptId}
                     </if>
                     <if test="dsDeptIds != null">
-                        or a.dept_id in
+                        or ca.dept_id in
                         <foreach item="item" collection="dsDeptIds" separator="," open="(" close=")" index="">
                             #{item}
                         </foreach>