Merge branch 'master' of http://dev.xinyingpower.com:8080/git/xymp/backend

xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalScheduleRuleServiceImpl.java

@@ -402,8 +402,9 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ
             terminalSchedules.add(record);
         }
         Date date = new Date();
+        if(CollectionUtil.isNotEmpty(terminalSchedules)) {
             terminalScheduleDao.insertOrUpdate(terminalSchedules, date, date);//将实际的拍照时间表规则从临时表更新到正式表中
-
+        }
         ArrayList<Integer> distinct = CollectionUtil.distinct(scheduleidlist);
         List<ScheduleDetails> scheduleDetails = scheduleDetailsDao.selectAllBySceduleidList(distinct);
         ArrayList<TerminalScheduleDetails> terminalScheduleDetails = new ArrayList<>();
@@ -422,7 +423,9 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ
                 }
             }
         }
+        if(CollectionUtil.isNotEmpty(terminalSchedules)) {
             terminalScheduleDetailsDao.deleteByTermidAndChannelIdList(terminalSchedules);
+        }
         terminalScheduleDetailsDao.insertList(terminalScheduleDetails, date, date);
         int i = requestResultsDao.updateByRequestIdList(requestidlist, CommonStatus.EFFECTIVE.value());//根据requestid将结果表中的状态修改为已下发
         if (i != 0) {
@@ -488,6 +491,7 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ
     public ServiceBody<TerminalScheduleRuleTimeListModel> getCmaSchelduleDetials(RequestIdVo vo) {
         TerminalScheduleRuleTimeListModel model = new TerminalScheduleRuleTimeListModel();
         RequestResults results = requestResultsDao.selectByRequestId(vo.getRequestid());
+        if(null!=results){
         String resultsData = results.getData();
         if (StringUtils.isNotBlank(resultsData)) {
             JSONObject resultObj = JSONObject.parseObject(resultsData);
@@ -509,6 +513,7 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ
                     model.setIsNew(true);
                 }
             }
+        }
             return Asserts.success(model);
         } else {
             return Asserts.error("查询失败");