Merge branch 'usky-zyj' of uskycloud/usky-modules into server-165

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/PatrolInspectionPlanSonServiceImpl.java

@@ -770,7 +770,8 @@ public class PatrolInspectionPlanSonServiceImpl extends AbstractCrudService<Patr
                 patrolInspectionPlanSonVo.setUndetectedSiteCount(0);
                 //计划名称
                 for (int j = 0; j < planList.size(); j++) {
-                    if (planSonList.get(i).getPlanId() == planList.get(j).getId()) {
+                    if (planSonList.get(i).getPlanId().equals(planList.get(j).getId())) {
+                        patrolInspectionPlanSonVo.setPlanId(planList.get(j).getId());
                         patrolInspectionPlanSonVo.setPlanName(planList.get(j).getPlanName());
                     }
                 }