Merge remote-tracking branch 'origin/master'

wuzeyu

2024-01-18 9281643d18bc2e0aaffed3c5f216d1df12d68424

 pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml

@@ -309,4 +309,13 @@
    where region.id = #{regionId,jdbcType=BIGINT}
  </select>

  <!--获取未绑控制器的取水口列表-->
  <select id="getNoBindingIntakes" resultType="java.util.HashMap">
    SELECT
        CAST(inta.id AS char)AS intakeId,
        name AS intakeName
    FROM pr_intake inta
    WHERE id NOT IN(SELECT intakeId FROM pr_controller) AND deleted = 0
  </select>

</mapper>