Merge remote-tracking branch 'origin/master'

railway-admin/src/main/java/com/railway/web/controller/business/catenary/BusJcebController.java

@@ -56,6 +56,7 @@ public class BusJcebController extends BaseController {
   @GetMapping(value = "listByType")
   public TableDataInfo listByType(JcebQueryVo query) {
     startPage();
+
     JcebTypeEnum jcebTypeEnum = JcebTypeEnum.ofValue(query.getJcebType());
     List<JcebRecordVo> list = null;
     switch (jcebTypeEnum){

railway-business/src/main/resources/mapper/baseinfo/BusBlqMapper.xml

@@ -673,7 +673,6 @@
       <if test='null != createTime'>create_time = #{createTime},</if>
       <if test='null != updateBy'>update_by = #{updateBy},</if>
       <if test='null != updateTime'>update_time = #{updateTime},</if>
-      <if test='null != deptId'>dept_id = #{deptId}</if>
     </set>
     WHERE id = #{id}
   </update>

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

@@ -373,7 +373,7 @@
         and t.station_id=#{stationId}
       </if>
       <if test="deptId!=null and deptId!=''">
-        and t.dept_id=#{deptId}
+        and v.dept_id=#{deptId}
       </if>
       <if test="pillarCode!=null and pillarCode!=''">
         and t.pillar_code=#{pillarCode}