Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-09-09 4ad61e4c257621124625a89853eaa8334a11b0be

 base-server/src/main/resources/mapper/TechnologyTemplateMapper.xml

@@ -16,7 +16,7 @@
        <result property="name" column="father"/>
    </resultMap>
    <select id="selectAllTechTem" resultMap="selectAllTechTemMap">
        select  e.name elname,
        select e.name elname,
        father
        from mom_ocean.technology_template t,
        mom_ocean.element e,
@@ -24,6 +24,7 @@
        where e.id = et.element_id
        and t.id = tech_tem_id
        and t.state = 1
        and et.state=1
        and type=#{type}
        <if test="message!=null and message!=''">
            and father like concat('%',#{message},'%')
@@ -49,10 +50,10 @@

    <!--根据id查看详情-->
    <resultMap id="selecTechByIdMap" type="map">
        <id property="id" column="type"/>
        <result property="name" column="father"/>
        <id property="type" column="type"/>
        <result property="father" column="father"/>
        <result property="name" column="name"/>
        <result property="name" column="device_group"/>
        <result property="deviceGroup" column="device_group"/>
        <collection property="children" resultMap="selecTechByIdsMap" javaType="List"/>
    </resultMap>
    <resultMap id="selecTechByIdsMap" type="map">