xzzn/SIPAIIS_WMS_JSSW
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug

Browse Source
This commit is contained in:
Timer
2026-04-27 21:30:48 +08:00
parent 2ca6153cda
commit 8cc0555d1f
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/sipai/controller/report/RptCreateController.java
View File

@ -723,7 +723,14 @@ public class RptCreateController {
RptCreate rptCreate = this.rptCreateService.selectById(id);
if (rptCreate != null) {//报表生成
try {
String base = this.rptCreateService.convertExceltoHtml(CommUtil.fixRptCreateFileName(rptCreate.getRptname() + rptCreate.getId()), sheetname, id, layerType, FileNameSpaceEnum.RptCreateFile.getNameSpace());
// 优先使用数据库中存储的文件路径，如果没有则构造路径（兼容旧数据）
String filePath;
if (rptCreate.getAbspath() != null && !rptCreate.getAbspath().isEmpty()) {
filePath = rptCreate.getAbspath();
} else {
filePath = CommUtil.fixRptCreateFileName(rptCreate.getRptname() + rptCreate.getId());
}
String base = this.rptCreateService.convertExceltoHtml(filePath, sheetname, id, layerType, FileNameSpaceEnum.RptCreateFile.getNameSpace());
//截取掉sheet名 目前只能先截取h2
String result = subRangeString(base, "<h2>", "</h2>");
result = result.replaceAll("<table class=\"t1\">", "<table class=\"t1\" id=\"t1\">");

9
src/main/java/com/sipai/security/tag/AuthorizeTag.java
View File

@ -34,9 +34,16 @@ public class AuthorizeTag extends BodyTagSupport {
@SuppressWarnings("static-access")
@Override
public int doStartTag() {
HttpServletRequest request = ((ServletRequestAttributes)RequestContextHolder.getRequestAttributes()).getRequest();
ServletRequestAttributes requestAttributes = (ServletRequestAttributes)RequestContextHolder.getRequestAttributes();
if (requestAttributes == null) {
return this.SKIP_BODY;
}
HttpServletRequest request = requestAttributes.getRequest();
SecurityContextImpl securityContextImpl = (SecurityContextImpl) request
.getSession().getAttribute("SPRING_SECURITY_CONTEXT");
if (securityContextImpl == null || securityContextImpl.getAuthentication() == null) {
return this.SKIP_BODY;
}
try {
//获取当前登录名
String name = securityContextImpl.getAuthentication().getName();