危险作业列表查询时监督人,监护人等字段非内部,承包商人包bug修改

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/hazard/service/impl/THazardWorkPlanServiceImpl.java

@@ -199,10 +199,16 @@ public class THazardWorkPlanServiceImpl extends SuperServiceImpl<THazardWorkPlan
         tHazardWorkPlanDTO.setProjectLeaderName(getUserNamesByUserIds(projectLeader));
         //监护人
         String guardian = tHazardWorkPlanDTO.getGuardian();
-        tHazardWorkPlanDTO.setGuardianName(getUserNamesByUserIds(guardian));
+        log.info("guardian-------->"+guardian);
+        if(!StringUtils.isEmpty(guardian)){
+            tHazardWorkPlanDTO.setGuardianName(getUserNamesByUserIds(guardian));
+        }
+
         //监督人
         String supervisor = tHazardWorkPlanDTO.getSupervisor();
-        tHazardWorkPlanDTO.setSupervisorName(getUserNamesByUserIds(supervisor));
+        if(!StringUtils.isEmpty(supervisor)){
+            tHazardWorkPlanDTO.setSupervisorName(getUserNamesByUserIds(supervisor));
+        }
         //作业人
         String operator = tHazardWorkPlanDTO.getOperator();
         tHazardWorkPlanDTO.setOperatorName(getUserNamesByUserIds(operator));
@@ -1698,7 +1704,11 @@ public class THazardWorkPlanServiceImpl extends SuperServiceImpl<THazardWorkPlan
                     return tContractorPerson.getName();
                 }
             } else {
-                return split[1];
+                log.info("split-------->"+split);
+                if(split.length>1){
+                    return split[1];
+                }
+                return null;
             }
         }
         return null;