【CHG】解决变电所和线路一对多关系造成的问题

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

@@ -50,6 +50,9 @@
       <if test='null != substationId'>
         substation_id,
       </if>
+      <if test='null != lineId'>
+        line_id,
+      </if>
       <if test='null != xingbie'>
         xingbie,
       </if>
@@ -85,6 +88,9 @@
       <if test='null != substationId'>
         #{substationId},
       </if>
+      <if test='null != lineId'>
+        #{lineId},
+      </if>
       <if test='null != xingbie'>
         #{xingbie},
       </if>
@@ -128,6 +134,7 @@
     UPDATE base_jlgz
     <set>
       <if test='null != substationId'>substation_id = #{substationId},</if>
+      <if test='null != lineId'>line_id = #{lineId},</if>
       <if test='null != xingbie'>xingbie = #{xingbie},</if>
       <if test='null != marker'>marker = #{marker},</if>
       <if test='null != yylx'>yylx = #{yylx},</if>
@@ -149,7 +156,7 @@
     dict2.dict_label as yylx_text
     FROM
     base_jlgz t
-    LEFT JOIN v_substation v ON t.substation_id = v.substation_id
+    LEFT JOIN v_substation v ON t.substation_id = v.substation_id and t.line_id = v.line_id
     LEFT JOIN sys_dict_data dict1 ON (t.xingbie = dict1.dict_value AND dict1.dict_type = 'xingbie')
     LEFT JOIN sys_dict_data dict2 ON (t.yylx = dict2.dict_value AND dict2.dict_type = 'gzyy')
     <where>
@@ -171,7 +178,7 @@
     <include refid="Base_Column_List"/>
     FROM
     base_jlgz t
-    LEFT JOIN v_substation v ON t.substation_id = v.substation_id
+    LEFT JOIN v_substation v ON t.substation_id = v.substation_id and t.line_id = v.line_id
     LEFT JOIN sys_dict_data dict1 ON (t.xingbie = dict1.dict_value AND dict1.dict_type = 'xingbie')
     LEFT JOIN sys_dict_data dict2 ON (t.yylx = dict2.dict_value AND dict2.dict_type = 'gzyy')
     <where>
@@ -238,7 +245,7 @@
             dict2.dict_label as yylx_text,
             t.yylx
           FROM base_jlgz t
-          LEFT JOIN v_substation v ON t.substation_id = v.substation_id
+          LEFT JOIN v_substation v ON t.substation_id = v.substation_id and t.line_id = v.line_id
           LEFT JOIN sys_dict_data dict2 ON (t.yylx = dict2.dict_value AND dict2.dict_type = 'gzyy')
           WHERE t.del_flag = '0'
           <if test="query.lineId != null and query.lineId != ''">