履职任务NFC过滤完善

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/gx/service/ResumptionServiceImpl.java

@@ -305,7 +305,8 @@ public class ResumptionServiceImpl implements ResumptionService {
                     }
                 } else {
                     for (ResumptionNFCVo nfcVo : orgAllNFCs) {
-                        if (nfcVo.getAreaId().equals(resumptionPlanVo.getAreaId())) {
+                        if (nfcVo.getAreaId().equals(resumptionPlanVo.getAreaId()) &&
+                                (ObjectUtil.isNull(resumptionPlanVo.getCheckId()) || ObjectUtil.equal(nfcVo.getCheckId(),resumptionPlanVo.getCheckId()))) {
                             nfcVo.setPointScan(resumptionPlanVo.getPointScan());
                             usedNFCID.add(nfcVo.getNfcId());
                         }