|
@@ -1004,7 +1004,7 @@
|
|
AND a.create_date < #{endDate}
|
|
AND a.create_date < #{endDate}
|
|
</if>
|
|
</if>
|
|
AND a.status != 7 AND a.del_flag = #{DEL_FLAG_NORMAL}
|
|
AND a.status != 7 AND a.del_flag = #{DEL_FLAG_NORMAL}
|
|
- and prd.number is not null
|
|
|
|
|
|
+ /*and prd.number is not null*/
|
|
<if test="sqlMap.dsf !=null and sqlMap.dsf!=''">
|
|
<if test="sqlMap.dsf !=null and sqlMap.dsf!=''">
|
|
AND ((w1.user_id = #{currentUser.id} AND w1.del_flag='0' AND a.company_id = #{currentUser.company.id} )${sqlMap.dsf} )
|
|
AND ((w1.user_id = #{currentUser.id} AND w1.del_flag='0' AND a.company_id = #{currentUser.company.id} )${sqlMap.dsf} )
|
|
</if>
|
|
</if>
|
|
@@ -1091,7 +1091,7 @@
|
|
AND a.create_date < #{endDate}
|
|
AND a.create_date < #{endDate}
|
|
</if>
|
|
</if>
|
|
AND a.status != 7 AND a.del_flag = #{DEL_FLAG_NORMAL}
|
|
AND a.status != 7 AND a.del_flag = #{DEL_FLAG_NORMAL}
|
|
- and prd.number is not null
|
|
|
|
|
|
+ /*and prd.number is not null*/
|
|
<if test="sqlMap.dsf !=null and sqlMap.dsf!=''">
|
|
<if test="sqlMap.dsf !=null and sqlMap.dsf!=''">
|
|
AND ((w1.user_id = #{currentUser.id} AND w1.del_flag='0' AND a.company_id = #{currentUser.company.id})${sqlMap.dsf} )
|
|
AND ((w1.user_id = #{currentUser.id} AND w1.del_flag='0' AND a.company_id = #{currentUser.company.id})${sqlMap.dsf} )
|
|
</if>
|
|
</if>
|