增加避雷器的生产厂家关联查询

railway-business/src/main/resources/mapper/catenary/BusJcbBlqMapper.xml

@@ -356,7 +356,7 @@
     FROM bus_jcb_blq t
     LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
     LEFT JOIN sys_user u on t.confirm_user = u.user_name
-    LEFT JOIN (select DISTINCT pillar_code,sccj from base_blq) base on t.pillar_code = base.pillar_code
+    LEFT JOIN (select DISTINCT pillar_code,sccj,dept_station_id from base_blq) base on (t.pillar_code = base.pillar_code and t.dept_station_id = base.dept_station_id)
     WHERE t.del_flag='0' and t.id = #{id}
 
   </select>
@@ -367,7 +367,7 @@
     FROM bus_jcb_blq t
     LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
     LEFT JOIN sys_user u on t.confirm_user = u.user_name
-    LEFT JOIN (select DISTINCT pillar_code,sccj from base_blq) base on t.pillar_code = base.pillar_code
+    LEFT JOIN (select DISTINCT pillar_code,sccj,dept_station_id from base_blq) base on (t.pillar_code = base.pillar_code and t.dept_station_id = base.dept_station_id)
     <where>
       t.del_flag='0'
       <if test="blqId!=null and blqId!=''">
@@ -500,7 +500,7 @@
     bus_jcb_blq t
     LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
     LEFT JOIN sys_user u on t.confirm_user = u.user_name
-    LEFT JOIN (select DISTINCT pillar_code,sccj from base_blq) base on t.pillar_code = base.pillar_code
+    LEFT JOIN (select DISTINCT pillar_code,sccj,dept_station_id from base_blq) base on (t.pillar_code = base.pillar_code and t.dept_station_id = base.dept_station_id)
     WHERE
     t.submit_state = '1'and t.del_flag = '0'
     <if test="stationId!=null and stationId!=''">
@@ -525,7 +525,7 @@
     <include refid="Base_Column_List"/>,u.real_name confirm_user_real_name,base.sccj
     FROM bus_jcb_blq t
     LEFT JOIN sys_user u on t.confirm_user = u.user_name
-    LEFT JOIN (select DISTINCT pillar_code,sccj from base_blq) base on t.pillar_code = base.pillar_code
+    LEFT JOIN (select DISTINCT pillar_code,sccj,dept_station_id from base_blq) base on (t.pillar_code = base.pillar_code and t.dept_station_id = base.dept_station_id)
     LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
     <where>
       t.del_flag='0'