Merge remote-tracking branch 'origin/master'

lin

2024-03-20 70a29ae28b85643e00a4b7fbf111a95646a24dc2

 src/main/java/org/springblade/modules/task/mapper/EcCallEventMapper.xml

@@ -42,12 +42,23 @@
        <if test="eCallEvent.realName!=null and eCallEvent.realName!=''">
            and jece.real_name like concat('%',#{eCallEvent.realName},'%')
        </if>
        <if test="eCallEvent.regionCode!=null and eCallEvent.regionCode!=''">
            and jece.community_code like concat('%',#{eCallEvent.regionCode},'%')
        <if test="isAdministrator==2">
            <choose>
                <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
                    and jece.community_code in
                    <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
                        #{code}
                    </foreach>
                </when>
                <otherwise>
                    and jece.community_code in ('')
                </otherwise>
            </choose>
        </if>
        <if test="eCallEvent.communityName!=null and eCallEvent.communityName!=''">
            and br.name like concat('%',#{eCallEvent.communityName},'%')
        </if>
        order by jece.create_time desc,jece.id desc
    </select>