|
|
@@ -749,12 +749,12 @@
|
|
|
patentState,
|
|
|
c.annual_fee_state as annualFeeState, p.authorized_date as authorizedDate
|
|
|
from patent_info p
|
|
|
- LEFT JOIN patent_cost c on p.id = c.pid
|
|
|
+ LEFT JOIN patent_cost c on p.id = c.pid and c.annual_fee_state = 0
|
|
|
LEFT JOIN organization_identity o on p.uid = o.uid
|
|
|
<if test="principal != null">
|
|
|
left join patent_log l on p.id=l.pid
|
|
|
</if>
|
|
|
- where p.deleted_sign = 0
|
|
|
+ where p.deleted_sign = 0 and c.annual_fee_state = 0
|
|
|
<if test="principal != null">
|
|
|
and l.principal = #{principal,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
@@ -781,7 +781,7 @@
|
|
|
<if test="principal != null">
|
|
|
left join patent_log l on p.id=l.pid
|
|
|
</if>
|
|
|
- where p.deleted_sign = 0
|
|
|
+ where p.deleted_sign = 0 and c.annual_fee_state = 0
|
|
|
<if test="principal != null">
|
|
|
and l.principal = #{principal,jdbcType=VARCHAR}
|
|
|
</if>
|