Merge remote-tracking branch 'origin/master'

Administrator

2021-09-18 3b1e22dc8460daafc2ecbae478ddcbe5ea21b944

 src/main/java/org/springblade/modules/talk/mapper/TalkMapper.xml

@@ -18,8 +18,14 @@

    <select id="selectTalkPage" resultMap="talkResultMap">
        select * from sys_talk where 1=1
        <if test="talk.deptid!=null and alk.deptid!='' and alk.deptid!='1123598813738675201'">
            deptid=#{talk.deptid}
        <if test="talk.deptid!=null and talk.deptid!='' and talk.deptid!='1123598813738675201'">
            and deptid = #{talk.deptid}
        </if>
        <if test="talk.realName!=null and talk.realName!=''">
            and real_name like concat('%',#{talk.realName},'%')
        </if>
        <if test="talk.title!=null and talk.title!=''">
            and title like concat('%',#{talk.title},'%')
        </if>
    </select>