Merge remote-tracking branch 'origin/V0.0.5' into V0.0.5

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/service/impl/CoreMonitoringTaskRegistrationServiceImpl.java

@@ -88,7 +88,7 @@ private ITMonitoringRetrievalPlanService itMonitoringRetrievalPlanService;
         //如果进来的NFC不是本机构和不是设备间就不让扫
         if (StringUtils.isNotEmpty(coreMonitoringTaskRegistration.getStartNfc())) {
             List<Long> longs = remoteNfcBindService.selectNfcByCode(coreMonitoringTaskRegistration.getStartNfc(), SecurityConstants.INNER);
-            if (!longs.contains(SecurityUtils.getUserId())) {
+            if (!longs.contains(SecurityUtils.getLoginUser().getOrgId())) {
                 throw new ServiceException("请扫描本机构NFC");
             }
         }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/service/impl/TMonitoringRetrievalPlanServiceImpl.java

@@ -170,6 +170,8 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
         List<CoreMonitoringRetrievalTask> coreMonitoringRetrievalTasks = iCoreMonitoringRetrievalTaskService.selectAllTaskByPlanId(collect, status);
         if (CollectionUtils.isNotEmpty(coreMonitoringRetrievalTasks)) {
             isComplete = true;
+        }else {
+            isComplete=false;
         }
         if (plan.getPlanStatus() == 0) {
             isComplete = false;