zengh
2021-01-11 db0b070e51db46e779b8d2ad1d4d213b712602cd
src/main/java/org/springblade/modules/equipment/mapper/EquipmentMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="org.springblade.modules.equipment.mapper.EquipmentMapper">
    <!-- 通用查询映射结果 -->
    <resultMap id="equipmentResultMap" type="org.springblade.modules.equipment.entity.Equipment">
    <resultMap id="equipmentResultMap" type="org.springblade.modules.equipment.vo.EquipmentVO">
        <id column="id" property="id"/>
        <result column="deviceName" property="deviceName"/>
        <result column="deviceNumber" property="deviceNumber"/>
@@ -21,6 +21,8 @@
        <result column="serialNumber" property="serialNumber"/>
        <result column="stype" property="stype"/>
        <result column="channelNumber" property="channelNumber"/>
        <result column="pay" property="pay"/>
        <result column="expireTime" property="expireTime"/>
    </resultMap>
    <resultMap id="treeNodeResultMap" type="org.springblade.core.tool.node.TreeNode">
@@ -61,7 +63,7 @@
        FORMAT( jd, 6 ) AS jd,
        FORMAT( wd, 6 ) AS wd,
        street,
        addvcd from sys_equipment where 1=1
        addvcd,pay,expireTime from sys_equipment where 1=1
        <if test="deviceName!=null">
            and (deviceName like concat('%',#{deviceName},'%') or deviceNumber like
            concat('%',#{deviceName},'%'))