Merge remote-tracking branch 'origin/master'

src/main/java/com/inspect/simulator/service/impl/AlgorithmServiceImpl.java

@@ -198,6 +198,7 @@ public class AlgorithmServiceImpl implements AlgorithmService {
 
         // 根据patrol_point_id查询数据表patrol_preset_pos，得到channel_id,根据channel_id查询数据表basedata_eqpbook_channel，得到channel_content
         BasedataPatrolPoint basedataPatrolPoint = new BasedataPatrolPoint();
+        basedataPatrolPoint.setPatrolPointId(Long.valueOf(patrolPointId));
         basedataPatrolPoint.setPatrolPointCode(patrolPointId);
         List<BasedataPatrolPoint> basedataPatrolPoints = basedataPatrolPointMapper.selectBasedataPatrolPointListLikePointCode(basedataPatrolPoint);
         if (basedataPatrolPoints == null || basedataPatrolPoints.isEmpty()) {

src/main/resources/mapper/BasedataPatrolPointMapper.xml

@@ -125,6 +125,7 @@
         <include refid="selectBasedataPatrolPointVo"/>
         <where>
             <if test="patrolPointCode != null  and patrolPointCode != ''">and patrol_point_code  like concat('%|', #{patrolPointCode})</if>
+            <if test="patrolPointId != null  and patrolPointId != ''"> or patrol_point_id = #{patrolPointId}</if>
         </where>
     </select>