|
|
@@ -517,16 +517,16 @@
|
|
|
select count(*)
|
|
|
from patent_new a left join admin b on a.aid=b.id
|
|
|
where 1=1
|
|
|
- <if test="aid != null">
|
|
|
+ <if test="aid != null">
|
|
|
and a.aid = #{aid,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
<if test="status != null">
|
|
|
and a.status=#{status}
|
|
|
</if>
|
|
|
- <if test="type != null">
|
|
|
+ <if test="type != null">
|
|
|
and a.type=#{type}
|
|
|
</if>
|
|
|
- <if test="startDate != null and endDate != null">
|
|
|
+ <if test="startDate != null and endDate != null">
|
|
|
and a.apply_date between #{startDate} and #{endDate}
|
|
|
</if>
|
|
|
<if test="name != null">
|
|
|
@@ -541,10 +541,6 @@
|
|
|
<if test="departmentId != null">
|
|
|
and b.department_id= #{departmentId}
|
|
|
</if>
|
|
|
- where 1=1
|
|
|
- <if test="aid != null">
|
|
|
- and a.aid = #{aid,jdbcType=VARCHAR}
|
|
|
- </if>
|
|
|
</select>
|
|
|
|
|
|
<select id="AllselectStartPatentNew" resultMap="BaseResultMap">
|