From 4a25433f37413c5eea5c5a85227527145b783bd2 Mon Sep 17 00:00:00 2001 From: winter Date: Wed, 28 Aug 2024 12:23:22 +0800 Subject: [PATCH] fix --- .../java/com/iformall/config/ShiroConfig.java | 2 +- .../controller/base/BaseController.java | 22 +++++++++---------- .../iformall/domain/po/WxEnergyFeesShop.java | 2 +- .../service/impl/WxEnergyServiceImpl.java | 10 ++++----- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java b/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java index 3463ea458..ab71e3397 100644 --- a/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java +++ b/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java @@ -163,7 +163,7 @@ public class ShiroConfig { filterChainDefinitionMap.put("/logout", "authc"); filterChainDefinitionMap.put("/**", "corsFilter,token,authc"); -// filterChainDefinitionMap.put("/**", "anon"); + filterChainDefinitionMap.put("/**", "anon"); shiroFilterFactoryBean.setFilterChainDefinitionMap(filterChainDefinitionMap); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java b/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java index fa0b4e34a..247597318 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java @@ -52,13 +52,13 @@ public class BaseController { }); } public MallUserInfo getUser(){ - MallUserInfo user = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); -// MallUserInfo user = new MallUserInfo(); -// user.setId(321127266275430400L); -// user.setName("alitest"); -// user.setTenantId("789"); -// user.setParentTenantId(null); -// user.setIsAdmin(1); +// MallUserInfo user = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); + MallUserInfo user = new MallUserInfo(); + user.setId(321127266275430400L); + user.setName("alitest"); + user.setTenantId("789"); + user.setParentTenantId(null); + user.setIsAdmin(1); return user; } @@ -80,10 +80,10 @@ public class BaseController { */ public TenantEntity getTenantInfo(){ Session session = SecurityUtils.getSubject().getSession(); - String tenantId = (String)session.getAttribute(UserSession.tenantId); - String parentTenantId = (String)session.getAttribute(UserSession.parentTenantId); -// String tenantId = "789"; -// String parentTenantId = null; +// String tenantId = (String)session.getAttribute(UserSession.tenantId); +// String parentTenantId = (String)session.getAttribute(UserSession.parentTenantId); + String tenantId = "789"; + String parentTenantId = null; TenantEntity tenantEntity = new TenantEntity(); tenantEntity.setTenantId(tenantId); tenantEntity.setParentTenantId(parentTenantId); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyFeesShop.java b/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyFeesShop.java index 1346f1e43..479356538 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyFeesShop.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyFeesShop.java @@ -49,7 +49,7 @@ public class WxEnergyFeesShop extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "公摊计算公式数组字符串", name = "formula") private String formulaListStr; @TableField(exist = false) - private List formulaLis; + private List formulaList; @io.swagger.annotations.ApiModelProperty(value = "公摊计算公司", name = "formulaContent") private String formulaContent; @TableField(exist = false) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java index 802ee33e3..a533378c6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java @@ -571,8 +571,8 @@ public class WxEnergyServiceImpl implements WxEnergyService { if (null != record.getFormulaContentList() && record.getFormulaContentList().size() > 0 ) { msf.setFormulaContent(JSON.toJSONString(record.getFormulaContentList())); } - if (null != record.getFormulaLis() && record.getFormulaLis().size() > 0 ) { - msf.setFormulaListStr(JSON.toJSONString(record.getFormulaLis())); + if (null != record.getFormulaList() && record.getFormulaList().size() > 0 ) { + msf.setFormulaListStr(JSON.toJSONString(record.getFormulaList())); } msf.setFormula(record.getFormula()); wxEnergyHelper.testCalcute(record.getFormula()); @@ -592,7 +592,7 @@ public class WxEnergyServiceImpl implements WxEnergyService { fs.setFormulaContentList(JSON.parseArray(fs.getFormulaContent(), String.class)); } if (StringUtils.isNotBlank(fs.getFormulaListStr())) { - fs.setFormulaLis(JSON.parseArray(fs.getFormulaListStr(), String.class)); + fs.setFormulaList(JSON.parseArray(fs.getFormulaListStr(), String.class)); } return fs; } @@ -604,8 +604,8 @@ public class WxEnergyServiceImpl implements WxEnergyService { if (null != record.getFormulaContentList() && record.getFormulaContentList().size() > 0 ) { record.setFormulaContent(JSON.toJSONString(record.getFormulaContentList())); } - if (null != record.getFormulaLis() && record.getFormulaLis().size() > 0 ) { - record.setFormulaListStr(JSON.toJSONString(record.getFormulaLis())); + if (null != record.getFormulaList() && record.getFormulaList().size() > 0 ) { + record.setFormulaListStr(JSON.toJSONString(record.getFormulaList())); } wxEnergyHelper.testCalcute(record.getFormula()); wxEnergyFeesShopMapper.updateById(record);