Merge remote-tracking branch 'origin/master'

signal-control-service/src/main/java/net/wanji/web/service/scheme/impl/SchemeConfigServiceImpl.java

@@ -353,15 +353,19 @@ public class SchemeConfigServiceImpl implements SchemeConfigService {
 //          Integer laneDir = CrossLisghtsLaneDirEnum.getLaneDirByLightsDir(dir);
             dirListElement.setDir(dir);
             // 是否有行人相位
-            List<BaseCrossLightsPO> crossLightsPOList = baseCrossLightsMapper.selectByCrossIdAndDir(crossId, dir);
-            for (BaseCrossLightsPO crossLightsPO : crossLightsPOList) {
-                Integer type = crossLightsPO.getType();
-                if (type >= 20 && type < 30) {
-                    Integer lightsId = crossLightsPO.getId();
-                    if (hasLightsId(lightsId, phaseId, crossId)) {
+            List<CrossPhaseLightsPO> crossPhaseLightsPOList1 = baseCrossPhaseLightsMapper.selectByPhaseId(phaseId);
+            for (CrossPhaseLightsPO crossPhaseLightsPO : crossPhaseLightsPOList1) {
+                Integer lightsId = crossPhaseLightsPO.getLightsId();
+                BaseCrossLightsPO baseCrossLightsPO = baseCrossLightsMapper.selectById(lightsId);
+                Integer lightsDir = baseCrossLightsPO.getDir();
+                Integer type = baseCrossLightsPO.getType();
+                if (type >= 20 && type < 30 && Objects.equals(lightsDir, dir)) {
                     dirListElement.setHasPersonPhase(1);
                 }
             }
+            List<BaseCrossLightsPO> crossLightsPOList = baseCrossLightsMapper.selectByCrossIdAndDir(crossId, dir);
+            for (BaseCrossLightsPO crossLightsPO : crossLightsPOList) {
+                Integer type = crossLightsPO.getType();
             }
             // 构造车道列表
             List<SaveSchemeConfigDTO.LaneListElement> laneList = buildLaneList(dir, phaseId);