| @@ -258,7 +258,7 @@ | |||||
| </select> | </select> | ||||
| <select id="findQrcodeEmptyList" resultMap="BaseResultMap"> | <select id="findQrcodeEmptyList" resultMap="BaseResultMap"> | ||||
| select <include refid="allColumns"/> from wx_merchant where (qr_code is null or tt_qr_code is null); | |||||
| select <include refid="allColumns"/> from wx_merchant m where (m.qr_code is null or m.tt_qr_code is null); | |||||
| </select> | </select> | ||||
| <select id="findBusByFloorId" resultType="hashmap" parameterType="hashmap"> | <select id="findBusByFloorId" resultType="hashmap" parameterType="hashmap"> | ||||
| @@ -316,8 +316,8 @@ | |||||
| </select> | </select> | ||||
| <select id="findByTrade" parameterType="java.util.Map" resultMap="BaseResultMap"> | <select id="findByTrade" parameterType="java.util.Map" resultMap="BaseResultMap"> | ||||
| select <include refid="allColumns"/> from wx_merchant where | |||||
| id in | |||||
| select <include refid="allColumns"/> from wx_merchant m where | |||||
| m.id in | |||||
| <foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")"> | <foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")"> | ||||
| #{idItem} | #{idItem} | ||||
| </foreach> | </foreach> | ||||
| @@ -326,14 +326,14 @@ | |||||
| <select id="getMerchantList" parameterType="com.iformall.domain.po.WxMerchant" resultMap="BaseResultMap"> | <select id="getMerchantList" parameterType="com.iformall.domain.po.WxMerchant" resultMap="BaseResultMap"> | ||||
| select <include refid="allColumns"/> from wx_merchant where is_del=0 and status=1 | |||||
| select <include refid="allColumns"/> from wx_merchant m where m.is_del=0 and m.status=1 | |||||
| <if test=" null != tenantId and '' != tenantId"> | <if test=" null != tenantId and '' != tenantId"> | ||||
| and `tenant_id` = #{tenantId} | |||||
| and m.`tenant_id` = #{tenantId} | |||||
| </if> | </if> | ||||
| <if test=" null != parentTenantId and '' != parentTenantId"> | <if test=" null != parentTenantId and '' != parentTenantId"> | ||||
| and `parent_tenant_id` = #{parentTenantId} | |||||
| and m.`parent_tenant_id` = #{parentTenantId} | |||||
| </if> | </if> | ||||
| order by create_date desc | |||||
| order by m.create_date desc | |||||
| </select> | </select> | ||||
| <update id="increaseCash" parameterType="com.iformall.domain.po.WxMerchant"> | <update id="increaseCash" parameterType="com.iformall.domain.po.WxMerchant"> | ||||