大屏增加检验检测详情修改

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcInspectionApplicationServiceImpl.java

@@ -609,7 +609,11 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
                 HashMap<String, Object> data = new HashMap<>();
                 data.put("label", flowLogger.get(i).get("approvalStatue"));
                 data.put("operatingTime", flowLogger.get(i).get("operateDate"));
-                data.put("operater", ((Map<String,Object>)flowLogger.get(i).get("assignee")).get("orgNamesWithoutRole")+":"+flowLogger.get(i).get("taskName"));
+                if(null != flowLogger.get(i).get("assignee")) {
+                    data.put("operater", ((Map<String, Object>) flowLogger.get(i).get("assignee")).get("orgNamesWithoutRole") + ":" + flowLogger.get(i).get("taskName"));
+                }else if(null != flowLogger.get(i).get("companyName")){
+                    data.put("operater", flowLogger.get(i).get("companyName") + ":" + flowLogger.get(i).get("taskName"));
+                }
                 records.add(data);
             }
         }