#

atms-api/src/main/java/pwc/taxtech/atms/common/message/ErrorMessage.java

@@ -15,7 +15,7 @@ public class ErrorMessage {
     public static final String  ImportFailed = "ImportFailed!";
     public static final String  ImportNotMatch = "导入文件与选择机构或期间不匹配!";
     public static final String  ExportFailed = "ExportFailed!";
-
+    public static final String  NoData = "无数据!";
 
 
 }

atms-api/src/main/java/pwc/taxtech/atms/service/impl/DataImportService.java

@@ -965,7 +965,7 @@ public class DataImportService extends BaseService {
             addDataImportLog(dataImportLogs);
             int isSuccess = (int) dataImportLogs.stream().filter(di -> Boolean.TRUE.equals(di.getImportResult())).count();
             if (isSuccess < 1) {
-                return OperationResultDto.error(ErrorMessage.ImportFailed);
+                return OperationResultDto.error(ErrorMessage.NoData);
             }
             return operationResultDto.success();
         } catch (Exception e) {
@@ -1070,7 +1070,7 @@ public class DataImportService extends BaseService {
             addDataImportLog(dataImportLogs);
             int isSuccess = (int) dataImportLogs.stream().filter(di -> Boolean.TRUE.equals(di.getImportResult())).count();
             if (isSuccess < 1) {
-                return OperationResultDto.error(ErrorMessage.ImportNotMatch);
+                return OperationResultDto.error(ErrorMessage.NoData);
             }
             return OperationResultDto.success();
         } catch (ServiceException e) {
@@ -1174,7 +1174,7 @@ public class DataImportService extends BaseService {
             int isSuccess = (int) dataImportLogs.stream().filter(di -> Boolean.TRUE.equals(di.getImportResult())).count();
             addDataImportLog(dataImportLogs);
             if (isSuccess < 1) {
-                return OperationResultDto.error(ErrorMessage.ImportFailed);
+                return OperationResultDto.error(ErrorMessage.NoData);
             }
             return OperationResultDto.success();
         } catch (ServiceException e) {
@@ -1461,7 +1461,7 @@ public class DataImportService extends BaseService {
             int isSuccess = (int) dataImportLogs.stream().filter(di -> Boolean.TRUE.equals(di.getImportResult())).count();
             addDataImportLog(dataImportLogs);
             if (isSuccess < 1) {
-                return OperationResultDto.error(ErrorMessage.ImportFailed);
+                return OperationResultDto.error(ErrorMessage.NoData);
             }
             return OperationResultDto.success();
         } catch (ServiceException e) {
@@ -1841,6 +1841,7 @@ public class DataImportService extends BaseService {
 
 
     private int addDataImportLog(List<DataImportLog> dataImportLogs) {
+        if(dataImportLogs.size() == 0) return  0;
         dataImportLogMapper.displayOld(dataImportLogs.get(0).getType());
         int res = 0;
         for (DataImportLog dataImportLog : dataImportLogs) {

atms-web/src/main/webapp/app/framework/utils/vatSessionService.js

 webservices.factory('vatSessionService', ['$log', 'localStorageService', function ($log, localStorageService) {
     'use strict';
     $log.debug('vatSessionService.ctor()...');
-
     var date = new Date();
     var month = date.getMonth();
     var projectyear = date.getFullYear();