fix: 获取部门树为启用的

wl

2022-12-29 d40a69e7d455c12e32201330a9fbe22a7b6b4b5d

 ycl-platform/src/main/resources/mapper/equipment/EquipmentBayonetMapper.xml

@@ -4,43 +4,46 @@

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ycl.entity.equipment.EquipmentBayonet">
        <id column="id" property="id" />
        <result column="bayonet_name" property="bayonetName" />
        <result column="longitude" property="longitude" />
        <result column="latitude" property="latitude" />
        <result column="ip_address" property="ipAddress" />
        <result column="port" property="port" />
        <result column="description" property="description" />
        <id column="id" property="id"/>
        <result column="name" property="name"/>
        <result column="longitude" property="longitude"/>
        <result column="latitude" property="latitude"/>
        <result column="ip_address" property="ipAddress"/>
        <result column="port" property="port"/>
        <result column="description" property="description"/>
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, bayonet_name, longitude, latitude, ip_address, port, description
        id
        , name, longitude, latitude, ip_address, port, description
    </sql>

    <select id="selectEquipmentPage" resultType="com.ycl.vo.equipment.EquipmentBayonetVO">
        SELECT
            t1.id,
            t1.bayonet_name,
            t1.description,
            t1.ip_address,
            t1.latitude,
            t1.longitude,
            t1.`port`,
            t2.`name` as frontEndType,
            t3.`name` as inOutCityType,
            t4.region_name as belongArea
        t1.id,
        t1.name,
        t1.description,
        t1.ip_address,
        t1.latitude,
        t1.longitude,
        t1.`port`,
        t1.belong_area,
        t1.front_end_type frontEndType,
        t1.in_out_city_type inOutCityType,
        t2.`name` as frontEndTypeName,
        t3.`name` as inOutCityTypeName
        FROM
            `ums_equipment_bayonet` t1
                LEFT JOIN
            ums_data_dictionary t2 on t1.front_end_type=t2.id
                LEFT JOIN
            ums_data_dictionary t3 on  t1.in_out_city_type=t3.id
                LEFT JOIN
            ums_sccg_region t4 on  t4.id=t1.belong_area
        `ums_equipment_bayonet` t1
        LEFT JOIN
        ums_data_dictionary t2 on t1.front_end_type=t2.id
        LEFT JOIN
        ums_data_dictionary t3 on t1.in_out_city_type=t3.id
        LEFT JOIN
        ums_sccg_region t4 on t4.id=t1.belong_area
        <where>
            <if test="bayonetName !=null and bayonetName !='' ">
                bayonet_name like CONCAT('%',#{bayonetName},'%')
                name like CONCAT('%',#{bayonetName},'%')
            </if>
        </where>
    </select>