Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

yanghui

2022-10-19 e94a80ae3d9733eb2d6a5d9bcbd50a624f058caa

 flower_city/src/main/resources/mapper/RoleManagementMapper.xml

@@ -21,6 +21,7 @@
            create_time,
            update_time,
            create_user_id,
            (select user_name from automessage_sys_user where create_user_id=automessage_sys_user.user_id) as createName,
            update_user_id
        FROM
            automessage_role_management
@@ -28,10 +29,10 @@

    <select id="selectConfigList"  resultMap="RoleManagementEntityResult">
        <include refid="selectRoleManagementEntityVo"/>
        <!--        <where>-->
        <!--            <if test="userName != null and userName != ''">-->
        <!--                AND user_name like concat('%', #{userName}, '%')-->
        <!--            </if>-->
        <where>
            <if test="name!=null and name!=''">
                and role_name like concat('%', #{name}, '%')
            </if>
        <!--            <if test="streetName != null and streetName != ''">-->
        <!--                AND street_name like concat('%', #{streetName}, '%')-->
        <!--            </if>-->
@@ -45,7 +46,7 @@
        <!--                AND role_id=#{roleId}-->
        <!--            </if>-->

        <!--        </where>-->
        </where>

        order by create_time desc
    </select>
@@ -89,6 +90,11 @@

    <select id="countNum" resultType="integer">
        select count(id) from automessage_role_management
        <where>
            <if test="name!=null and name!=''">
                and role_name like concat('%', #{name}, '%')
            </if>
        </where>
    </select>

</mapper>