Merge remote-tracking branch 'origin/master'

zhongrj

2024-03-11 7f3ee212eb210aba3a7da7d2cb4a8d1af2f56116

 src/main/java/org/springblade/modules/system/mapper/UserMapper.xml

@@ -84,6 +84,10 @@
        <if test="user.roleId!=null and user.roleId!=''">
            and role_id like concat('%',#{user.roleId},'%')
        </if>

        <if test="user.deptId!=null and user.deptId!=''">
            and dept_id like concat('%',#{user.deptId},'%')
        </if>
    </select>

    <select id="searchUserByDistrictId" resultType="org.springblade.modules.system.entity.User">