Merge remote-tracking branch 'origin/xinghong-dev'

java110

2020-12-10 634cea842c9a4f2ef1bddde07d7b5a334f0117de

 java110-db/src/main/resources/mapper/store/StoreServiceDaoImplMapper.xml

@@ -559,6 +559,19 @@
                #{item}
            </foreach>
        </if>
    </select>

    <!--查询员工和商户信息-->
    <select id="getStoreUserInfo" parameterType="Map" resultType="Map">
        select s.store_id,s.b_id,s.user_id,s.name,s.address,s.tel,s.store_type_cd,
        s.nearby_landmarks,s.map_x,s.map_y,s.create_time,su.store_user_id,su.rel_cd
        from s_store s left join s_store_user su on s.store_id=su.store_id
        <where>
            s.status_cd = "0" and su.status_cd = "0"
            <if test="userId != null and userId != ''">
                and su.user_id = #{userId}
            </if>
        </where>
    </select>

</mapper>