Merge remote-tracking branch 'origin/master'

tangzy

2022-07-18 6d7633051dc592f80b7967e34fa6e34f340f899d

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

@@ -73,4 +73,12 @@
        SELECT id, tenant_id, user_type, account, name, real_name, email, phone, birthday, role_id, dept_id, post_id FROM blade_user ${ew.customSqlSegment}
    </select>

    <!--查询用户信息-->
    <select id="getUserList" resultType="org.springblade.modules.system.entity.User">
        SELECT * FROM  blade_user where 1=1
        <if test="user.farmId!=null and user.farmId!=''">
           and find_in_set(farm_id,#{user.farmId})
        </if>
    </select>

</mapper>