Skip to content

C
cloud-platform
Commit 6c8dfd64 authored by libin's avatar libin
Browse files
Options

Merge branch 'master-wallet-bug-fix' into dev

parents dd779c9d 4e1fbe65
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 10 deletions
ace-modules/ace-admin/src/main/resources/mapper/AppUserSellingWaterMapper.xml
View file @ 6c8dfd64
...@@ -67,16 +67,10 @@ FROM ...@@ -67,16 +67,10 @@ FROM
) o LEFT JOIN ( SELECT DISTINCT order_no,user_id,source_id,order_type,img,price,title,waiting,`crt_time` FROM app_user_selling_water ) w ) o LEFT JOIN ( SELECT DISTINCT order_no,user_id,source_id,order_type,img,price,title,waiting,`crt_time` FROM app_user_selling_water ) w
ON o.order_no=w.order_no ON o.order_no=w.order_no
where 1=1 where 1=1
<choose> <if test="wating!=null">
<when test="wating!=null"> and `waiting`= #{wating} and <![CDATA[
and `waiting`= #{wating} o.`type`<>1 ]]>
</when> </if>
<otherwise>
and <![CDATA[
o.`type`<>1
]]>
</otherwise>
</choose>
ORDER BY `crt_time` ORDER BY `crt_time`
</select> </select>
</mapper> </mapper>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment