1

ruoyi-wages/src/main/java/com/ruoyi/system/service/impl/WagesCompilationServiceImpl.java

@@ -2,31 +2,18 @@ package com.ruoyi.system.service.impl;
 
 
 import com.alibaba.excel.EasyExcelFactory;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.utils.file.FileUtils;
 import com.ruoyi.system.listener.ExcelListener;
 import com.ruoyi.system.mapper.WagesCompilationMapper;
-import com.ruoyi.system.mapper.WagesDetailsMapper;
 import com.ruoyi.system.mapper.WagesVersionMapper;
-import com.ruoyi.system.model.wages.dao.WagesCompilationDAO;
 import com.ruoyi.system.model.wages.dao.WagesCompilationExcelDAO;
-import com.ruoyi.system.model.wages.dao.WagesDetailsExcelDAO;
-import com.ruoyi.system.model.wages.dao.WagesVersionDAO;
 import com.ruoyi.system.service.WagesCompilationService;
 import lombok.RequiredArgsConstructor;
-
-import org.apache.ibatis.annotations.Param;
-import org.apache.poi.ss.usermodel.*;
-import org.apache.poi.xssf.streaming.SXSSFWorkbook;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.io.*;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.time.LocalDateTime;
-import java.util.*;
-import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
 
 /**
  * @author haiwe

ruoyi-wages/src/main/java/com/ruoyi/system/service/impl/WagesServiceImpl.java

@@ -253,10 +253,8 @@ public class WagesServiceImpl implements WagesService {
         if (customDocument != null) {
             JSONObject customDocumentJsonObj = (JSONObject) JSON.toJSON(customDocument.getData().get(0));
             return customDocumentJsonObj.getJSONArray("recordList");
-        } else {
-            return null;
         }
-
+        return null;
     }
 
     private String getCodeFromCustomDoc(JSONArray customDoc, String nameZhCn) {