Merge remote-tracking branch 'origin/master'

maven

3 天以前 54441b789704a6ca10247fe44b342801d8a14353

 src/main/resources/mapper/collaborativeApproval/RulesRegulationsManagementMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,31 @@
<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.collaborativeApproval.mapper.RulesRegulationsManagementMapper">
    <resultMap id="RulesRegulationsManagementDTOMap" type="com.ruoyi.collaborativeApproval.dto.RulesRegulationsManagementDTO">
        <!-- å…¶ä»–字段映射（保持不变） -->
        <result column="id" property="id"/>
        <result column="regulation_num" property="regulationNum"/>
        <result column="title" property="title"/>
        <!-- ... çœç•¥å…¶ä»–字段 ... -->

        <!-- å…³é”®ä¿®å¤ï¼šä¸º scope å­—段指定类型处理器 -->
        <result column="scope" property="scope" typeHandler="com.ruoyi.approve.utils.ListToStringTypeHandler"/>
    </resultMap>

    <select id="listPage" resultMap="RulesRegulationsManagementDTOMap">
        select rrm.*, su.user_name as create_user_name
        from rules_regulations_management rrm
        left join sys_user su on rrm.create_user = su.user_id
        <where>
            <if test="ew.regulationNum != null and ew.regulationNum != ''">
                and rrm.regulation_num = #{ew.regulationNum}
            </if>
            <if test="ew.title != null and ew.title != ''">
                and rrm.title like concat('%',#{ew.title},'%')
            </if>
            <if test="ew.category != null">
                and rrm.category = #{ew.category}
            </if>
        </where>
    </select>
</mapper>