Merge branch 'dev' of...

Merge branch 'dev' of ssh://gitlab.91isoft.com:10022/wangfei/vehicle-quality-review into gaixiankang

quality-review/src/main/java/com/ruoyi/service/impl/StrategyCarReviewTaskPending.java

@@ -127,9 +127,9 @@ public class StrategyCarReviewTaskPending implements StrategyCarReviewTask, Init
     public void doConfirmReview(CarReviewTask carReviewTask) {
         List<ReviewDetails> detailsList = reviewDetailsMapper.findNoResult(carReviewTask.getId(),CarReviewTask.TYPE);
         List<ReviewTaskInbox> inboxList = reviewTaskInboxMapper.findConfirmListByTaskId(carReviewTask.getId());
-        if (detailsList.size() != 0 && detailsList != null) {
+        if (detailsList != null && detailsList.size() != 0) {
             throw new ServiceException("存在未填写的表单，请填写完整", HttpStatus.ERROR, detailsList);
-        } else if (inboxList.size() != 0 && inboxList != null){
+        } else if (inboxList != null && inboxList.size() != 0){
             throw new ServiceException("存在未确认的场景变更信息，请确认", HttpStatus.ERROR);
         }else {
             // 1. 获取最新问卷

quality-review/src/main/java/com/ruoyi/service/impl/StrategySystemReviewTaskPending.java

@@ -88,9 +88,9 @@ public class StrategySystemReviewTaskPending implements StrategySystemReviewTask
     public void doConfirm(SystemReviewTask systemReviewTask) {
         List<ReviewDetails> detailsList = reviewDetailsMapper.findNoResult(systemReviewTask.getId(),SystemReviewTask.TYPE);
         List<ReviewTaskInbox> inboxList = reviewTaskInboxMapper.findConfirmListByTaskId(systemReviewTask.getId());
-        if (detailsList.size() != 0 && detailsList != null) {
+        if (detailsList != null && detailsList.size() != 0) {
             throw new ServiceException("存在未填写的表单，请填写完整", HttpStatus.ERROR, detailsList);
-        } else if (inboxList.size() != 0 && inboxList != null){
+        } else if (inboxList != null && inboxList.size() != 0){
             throw new ServiceException("存在未确认的场景变更信息，请确认", HttpStatus.ERROR);
         } else {
             // 1. 获取最新问卷