diff --git a/src/main/java/com/biutag/supervision/service/ModelClueService.java b/src/main/java/com/biutag/supervision/service/ModelClueService.java index 73c23ae..8f4987e 100644 --- a/src/main/java/com/biutag/supervision/service/ModelClueService.java +++ b/src/main/java/com/biutag/supervision/service/ModelClueService.java @@ -338,14 +338,17 @@ public class ModelClueService extends ServiceImpl { } } // 反馈单 - if (modelId == 24) { //24号模型:警情未录入反馈人员信息 - String barId = (String) data.get("fkrbh"); - Map bar = barId != null && !barId.isEmpty() ? modelClueDataMapper.selectBAR(barId) : null; - if (bar != null) { - modelClue.setInvolvePoliceEmpNo((String) bar.get("JH")); - modelClue.setInvolvePoliceName((String) bar.get("XM")); + if (modelId == 24 || modelId == 27 || modelId == 28 || modelId == 30 ) { + String fkrbh = (String) data.get("fkrbh"); + String fkrxm = (String) data.get("fkrxm"); + if (fkrbh != null && !fkrbh.isEmpty()) { + modelClue.setInvolvePoliceEmpNo(fkrbh); } else { modelClue.setInvolvePoliceEmpNo("无警号数据"); + } + if (fkrxm != null && !fkrxm.isEmpty()) { + modelClue.setInvolvePoliceName(fkrxm); + } else { modelClue.setInvolvePoliceName("无姓名数据"); } }