Merge branch 'master' of http://192.168.0.105:10010/r/zhba_management_w

tangzy

2021-07-30 780ec2ea0b558c5603012abbfb8c1fa9845e6734

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

@@ -3,7 +3,7 @@
<mapper namespace="org.springblade.modules.system.mapper.UserMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="userResultMap" type="org.springblade.modules.system.entity.User">
    <resultMap id="userResultMap" type="org.springblade.modules.system.vo.UserVO">
        <result column="id" property="id"/>
        <result column="tenant_id" property="tenantId"/>
        <result column="create_user" property="createUser"/>
@@ -43,12 +43,19 @@
    </resultMap>

    <select id="selectUserPage" resultMap="userResultMap">
        select bu.* from
        select
            bu.*,
            sll.longitude,sll.latitude
        from
            blade_user bu
        left join
            blade_dept bd
        on
            bu.dept_id = bd.id
        left join
            sys_live_location sll
        on
            sll.worker_id = bu.id
        where
            bu.is_deleted = 0
        <if test="tenantId!=null and tenantId != ''">