|
@@ -409,18 +409,16 @@
|
409
|
409
|
|
410
|
410
|
<select id="select" resultMap="BaseResultMap" >
|
411
|
411
|
|
412
|
|
-select t.* from t_ware_store t where t.ware_name in (
|
413
|
|
-select b.name from t_maint_userware a ,t_maint_ware b where a.ware_id = b.id
|
414
|
|
-and user_id = #{param3,jdbcType=VARCHAR} ) and t.belong_id = #{param4,jdbcType=VARCHAR}
|
|
412
|
+select t.* from t_ware_store t where 1=1 and t.belong_id = #{param4,jdbcType=VARCHAR}
|
415
|
413
|
<if test="param1 != ''" >
|
416
|
|
- and t.ware_name = #{param1,jdbcType=VARCHAR}
|
|
414
|
+ and t.ware_id = #{param1,jdbcType=VARCHAR}
|
417
|
415
|
</if>
|
418
|
416
|
<if test="param2 != ''" >
|
419
|
|
- and t.stack_name = #{param2,jdbcType=VARCHAR}
|
|
417
|
+ and t.stack_id = #{param2,jdbcType=VARCHAR}
|
420
|
418
|
</if>
|
421
|
419
|
and ifnull(t.cancel_flag,'0') = '0'
|
422
|
420
|
and ifnull(t.out_flag,'0') = '0'
|
423
|
|
-order by t.stack_name asc , t.layer desc
|
|
421
|
+order by t.stack_id asc , t.layer asc
|
424
|
422
|
|
425
|
423
|
</select>
|
426
|
424
|
|