Merge remote-tracking branch 'origin/master'

linwei

2024-02-20 e67a8a7477096a295d65afa1c366d2b59f8752fc

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

@@ -98,7 +98,7 @@
            jd.id  = #{districtId}
          and bu.is_deleted = '0'
          and jh.is_deleted = '0'

          and jh.role_type = '1'
    </select>

    <!--根据手机号查询对应账号和手机号的用户信息-->
@@ -201,6 +201,13 @@
        where bu.is_deleted = 0 and bud.id is null
        and bu.dept_id!=''
    </select>
    <select id="getUserListByDeptIds" resultType="org.springblade.modules.system.entity.User">
        SELECT * FROM blade_user bu where is_deleted = 0
        and dept_id in
        <foreach collection="deptIds.split(',')" item="item" open="(" close=")" separator=",">
            #{item}
        </foreach>
    </select>

    <select id="getUserInfoByPropertyId" resultType="org.springblade.modules.system.entity.User"
            parameterType="java.lang.String">