diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java index 9d82a936..19ae5bd4 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java @@ -59,7 +59,6 @@ import com.jero.modules.system.service.ISysDepartService; import com.jero.modules.system.service.ISysDictItemService; import com.jero.modules.system.service.ISysUserService; import com.jero.modules.system.util.SysWaterMarkUtil; -import com.jero.modules.system.util.UserUtils; import com.jero.modules.tag.entity.LawsArea; import com.jero.modules.tag.entity.LawsTag; import com.jero.modules.tag.enums.FieldShowTypeEnum; @@ -71,6 +70,8 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.poi.hssf.usermodel.HSSFSheet; +import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.usermodel.*; import org.apache.poi.ss.util.CellRangeAddress; import org.apache.poi.xssf.usermodel.XSSFSheet; @@ -157,8 +158,6 @@ public class LawsCommonServiceImpl implements ILawsCommonService { @Resource private ILawsPartNameService partNameService; @Resource - private ISysUserService sysUserRoleService; - @Resource private ILawsPartNameStandardService partNameStandardService; @Resource private ISysBaseAPI sysBaseAPI; @@ -1419,8 +1418,8 @@ public class LawsCommonServiceImpl implements ILawsCommonService { IPage> commonPage = this.getExportData(parameterMap, headers); List> records = commonPage.getRecords(); - XSSFWorkbook workbook = new XSSFWorkbook(); - XSSFSheet sheet = workbook.createSheet(sheetName); + HSSFWorkbook workbook = new HSSFWorkbook(); + HSSFSheet sheet = workbook.createSheet(sheetName); Row headerRow = sheet.createRow(0); for (int i = 0; i < headers.size(); i++) { @@ -1445,7 +1444,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService { } // 设置响应头和内容类型 - String encodedFileName = URLEncoder.encode(fileName + ".xlsx", "UTF-8"); + String encodedFileName = URLEncoder.encode(fileName + ".xls", "UTF-8"); response.setHeader("Content-Disposition", "attachment; filename=" + encodedFileName); // 写出到响应流 @@ -2064,12 +2063,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService { parameterMap.remove(FieldCommon.AUTH_DEPT); } } - // 外标引用标准 - // 如果当前登陆人是那几种管理员角色,则不需要授权部门筛选 - String userId = UserUtils.getUserId(); - SysUser user = sysUserService.getById(userId); // 管理员有所有外标的权限 - List roleList = sysUserRoleService.getRole(user.getUsername()); adminRoleCodeList.addAll(enterpriseDetailRoleCodeList); // 体系 String standardSystem = (String) parameterMap.get(FieldCommon.STANDARD_SYSTEM);