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

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

@@ -69,6 +69,9 @@ public class PatrolInspectionEventServiceImpl extends AbstractCrudService<Patrol
 
     @Override
     public void add(PatrolInspectionEvent patrolInspectionEvent){
+
+        Map<Object,Object> map = new HashMap<>();
+
         Integer planId = patrolInspectionEvent.getPlanId();
         LambdaQueryWrapper<PatrolInspectionPlanSchedule> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(PatrolInspectionPlanSchedule::getPlanId,planId);
@@ -81,13 +84,13 @@ public class PatrolInspectionEventServiceImpl extends AbstractCrudService<Patrol
 
             patrolInspectionEvent.setPersonnelId(personnelId);
             patrolInspectionEvent.setPersonnelName(one.getFullName());
+            map.put("idCard",one.getIdCard());
         }
         patrolInspectionEvent.setHandleStatus(0);
         patrolInspectionEvent.setTenantId(SecurityUtils.getTenantId());
         patrolInspectionEvent.setCreateBy(SecurityUtils.getUsername());
         patrolInspectionEvent.setCreateTime(LocalDateTime.now());
 
-        Map<Object,Object> map = new HashMap<>();
         map.put("deviceId",patrolInspectionEvent.getDeviceId());
         map.put("personnelId",patrolInspectionEvent.getPersonnelId());
         map.put("personnelName",patrolInspectionEvent.getPersonnelName());