|
|
@@ -310,16 +310,15 @@
|
|
|
</update>
|
|
|
|
|
|
<select id="selectWarehouseListByCondition" resultMap="WarehouseResultMapper">
|
|
|
- select * from customer left join customeraddress on cu_id=ca_cuid and customeraddress.ca_default = 1 left join customercontact on cu_id = cc_cuid
|
|
|
- and customercontact.cc_default=1
|
|
|
+ select * from Warehouse
|
|
|
<where>
|
|
|
<if test="con != null">
|
|
|
${con}
|
|
|
</if>
|
|
|
<if test="companyId != null">
|
|
|
- and customer.companyid = #{companyId}
|
|
|
+ and companyid = #{companyId}
|
|
|
</if>
|
|
|
- </where> order by cu_id
|
|
|
+ </where> order by wh_id
|
|
|
</select>
|
|
|
|
|
|
<select id="validateCodeWhenInsert" resultType="int">
|