Merge remote-tracking branch 'origin/master'

baizonghao

2023-03-18 807dc1fff85979874fbfc185918025e6b922ee3c

 ycl-platform/src/main/resources/mapper/dict/DataDictionaryMapper.xml

@@ -16,7 +16,8 @@

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, name, code, type_name,type_code,parent_id,level,remark
        id
        , name, code, type_name,type_code,parent_id,level,remark
    </sql>

    <resultMap id="settingsResultMap" type="com.ycl.vo.IllegalBuildingSettingVO">
@@ -27,6 +28,15 @@
        <result column="typeThird" property="typeThird" />
    </resultMap>

    <resultMap id="VoMap" type="com.ycl.vo.dict.DataDictionaryVo" extends="BaseResultMap">
        <collection property="children" javaType="ArrayList" ofType="com.ycl.entity.dict.DataDictionary">
            <result column="c_id" property="id"/>
            <result column="c_name" property="name"/>
            <result column="c_code" property="code"/>
            <result column="c_level" property="level"/>
            <result column="c_remark" property="remark"/>
        </collection>
    </resultMap>

    <select id="listDataDictionaryPage" resultType="com.ycl.vo.IllegalBuildingSettingVO">
        SELECT
@@ -41,6 +51,7 @@
            AND d1.type_code = '06'
            <if test="keyWord !=null and keyWord !=''">
                AND (d1.`name` LIKE  '%${keyWord}%'
                or d2.`name` LIKE '%${keyWord}%')
                or d2.`name` LIKE  '%${keyWord}%')
            </if>

@@ -74,4 +85,13 @@
        ORDER BY d1.parent_id,d2.parent_id,d3.parent_id,d4.parent_id
    </select>

    <select id="queryTreeType" resultMap="VoMap">
        SELECT p.*, c.id c_id, c.`name` c_name, c.`code` c_code, c.`level` c_level, c.remark c_remark
        FROM ums_data_dictionary p
                 LEFT JOIN ums_data_dictionary c on p.id = c.parent_id
        WHERE p.`type_code` = #{typeCode}
          and p.`level` = #{level}
        ORDER BY p.id, c.id
    </select>

</mapper>