diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/domain/SysLedscreen.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/domain/SysLedscreen.java
index 26e129b6..61b66ec0 100644
--- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/domain/SysLedscreen.java
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/domain/SysLedscreen.java
@@ -26,7 +26,6 @@ public class SysLedscreen extends BaseEntity
private Long projectId;
/** 分区ID */
- @Excel(name = "分区ID")
private Long workareaId;
/** 设备名称 */
@@ -46,6 +45,15 @@ public class SysLedscreen extends BaseEntity
private Long height;
+ private String workAreaAncestors;
+
+ public String getWorkAreaAncestors() {
+ return workAreaAncestors;
+ }
+
+ public void setWorkAreaAncestors(String workAreaAncestors) {
+ this.workAreaAncestors = workAreaAncestors;
+ }
/** LED绘图模式 */
@Excel(name = "LED绘图模式")
diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysLedscreenMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysLedscreenMapper.xml
index ebd9427c..122f55b5 100644
--- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysLedscreenMapper.xml
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysLedscreenMapper.xml
@@ -40,16 +40,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and sl.project_id = #{projectId}
and sl.workarea_id = #{workareaId}
and sl.device_name like concat('%', #{deviceName}, '%')
- and sl.device_sn = #{deviceSn}
+ and (sl.work_area_id = #{workAreaAncestors} or FIND_IN_SET(#{workAreaAncestors}, wa.ancestors) > 0)
+ and sl.device_sn like concat('%',#{deviceSn},'%')
and sl.width = #{width}
and sl.height = #{height}
and sl.draw_type = #{drawType}
- and sl.title = #{title}
+ and sl.title like concat('%',#{title},'%')
and sl.enabled = #{enabled}
and sl.is_del = #{isDel}
and sl.state = #{state}
-
+ and sl.device_sn like concat('%', #{deviceSn}, '%') and sl.device_sn like concat('%', #{deviceSn}, '%') and sl.device_sn like concat('%', #{deviceSn}, '%')