|
|
@@ -685,6 +685,9 @@
|
|
|
<if test="releaseStatus != null">
|
|
|
and a.release_status = #{releaseStatus,jdbcType=INTEGER}
|
|
|
</if>
|
|
|
+ <if test="techBrokerId != null">
|
|
|
+ and a.tech_broker_id = #{techBrokerId,jdbcType=VARCHAR}
|
|
|
+ </if>
|
|
|
order by a.serial_number desc
|
|
|
<if test="page_sql!=null">
|
|
|
${page_sql}
|
|
|
@@ -726,6 +729,9 @@
|
|
|
<if test="releaseStatus != null">
|
|
|
and release_status = #{releaseStatus,jdbcType=INTEGER}
|
|
|
</if>
|
|
|
+ <if test="techBrokerId != null">
|
|
|
+ and a.tech_broker_id = #{techBrokerId,jdbcType=VARCHAR}
|
|
|
+ </if>
|
|
|
</select>
|
|
|
|
|
|
|
|
|
@@ -770,6 +776,9 @@
|
|
|
<if test="releaseStatus != null">
|
|
|
and a.release_status = #{releaseStatus,jdbcType=INTEGER}
|
|
|
</if>
|
|
|
+ <if test="techBrokerId != null">
|
|
|
+ and a.tech_broker_id = #{techBrokerId,jdbcType=VARCHAR}
|
|
|
+ </if>
|
|
|
order by serial_number desc
|
|
|
<if test="page_sql!=null">
|
|
|
${page_sql}
|
|
|
@@ -811,6 +820,9 @@
|
|
|
<if test="releaseStatus != null">
|
|
|
and a.release_status = #{releaseStatus,jdbcType=INTEGER}
|
|
|
</if>
|
|
|
+ <if test="techBrokerId != null">
|
|
|
+ and a.tech_broker_id = #{techBrokerId,jdbcType=VARCHAR}
|
|
|
+ </if>
|
|
|
</select>
|
|
|
|
|
|
|
|
|
@@ -1147,11 +1159,11 @@
|
|
|
a.transfer_mode as transferMode,
|
|
|
interest.id as interestId,
|
|
|
u.lvl as level,
|
|
|
- ui.username as ownerName
|
|
|
+ a.owner_name as ownerName
|
|
|
FROM
|
|
|
achievement a
|
|
|
LEFT JOIN <![CDATA[ user ]]> u on u.id = a.owner_id
|
|
|
- LEFT JOIN user_identity ui ON a.owner_id = ui.uid
|
|
|
+ LEFT JOIN user_identity ui on ui.uid = a.owner_id
|
|
|
LEFT JOIN district_glossory dg on dg.id = ui.province
|
|
|
LEFT JOIN district_glossory dgg on dgg.id = ui.city
|
|
|
LEFT JOIN field_glossory fg on fg.id = a.field_a
|
|
|
@@ -1180,11 +1192,11 @@
|
|
|
a.transfer_mode as transferMode,
|
|
|
interest.id as interestId,
|
|
|
u.lvl as level,
|
|
|
- oi.unit_name as ownerName
|
|
|
+ a.owner_name as ownerName
|
|
|
FROM
|
|
|
achievement a
|
|
|
LEFT JOIN <![CDATA[ user ]]> u on u.id = a.owner_id
|
|
|
- LEFT JOIN organization_identity oi ON a.owner_id = oi.uid
|
|
|
+ LEFT JOIN organization_identity ui on oi.uid = a.owner_id
|
|
|
LEFT JOIN district_glossory dg on dg.id = oi.licence_province
|
|
|
LEFT JOIN district_glossory dgg on dgg.id = oi.licence_city
|
|
|
LEFT JOIN field_glossory fg on fg.id = a.field_a
|