| @@ -163,7 +163,7 @@ public class ShiroConfig { | |||||
| filterChainDefinitionMap.put("/logout", "authc"); | filterChainDefinitionMap.put("/logout", "authc"); | ||||
| filterChainDefinitionMap.put("/**", "corsFilter,token,authc"); | filterChainDefinitionMap.put("/**", "corsFilter,token,authc"); | ||||
| // filterChainDefinitionMap.put("/**", "anon"); | |||||
| filterChainDefinitionMap.put("/**", "anon"); | |||||
| shiroFilterFactoryBean.setFilterChainDefinitionMap(filterChainDefinitionMap); | shiroFilterFactoryBean.setFilterChainDefinitionMap(filterChainDefinitionMap); | ||||
| @@ -52,13 +52,13 @@ public class BaseController { | |||||
| }); | }); | ||||
| } | } | ||||
| public MallUserInfo getUser(){ | 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; | return user; | ||||
| } | } | ||||
| @@ -80,10 +80,10 @@ public class BaseController { | |||||
| */ | */ | ||||
| public TenantEntity getTenantInfo(){ | public TenantEntity getTenantInfo(){ | ||||
| Session session = SecurityUtils.getSubject().getSession(); | 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 tenantEntity = new TenantEntity(); | ||||
| tenantEntity.setTenantId(tenantId); | tenantEntity.setTenantId(tenantId); | ||||
| tenantEntity.setParentTenantId(parentTenantId); | tenantEntity.setParentTenantId(parentTenantId); | ||||
| @@ -49,7 +49,7 @@ public class WxEnergyFeesShop extends TenantEntity { | |||||
| @io.swagger.annotations.ApiModelProperty(value = "公摊计算公式数组字符串", name = "formula") | @io.swagger.annotations.ApiModelProperty(value = "公摊计算公式数组字符串", name = "formula") | ||||
| private String formulaListStr; | private String formulaListStr; | ||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private List<String> formulaLis; | |||||
| private List<String> formulaList; | |||||
| @io.swagger.annotations.ApiModelProperty(value = "公摊计算公司", name = "formulaContent") | @io.swagger.annotations.ApiModelProperty(value = "公摊计算公司", name = "formulaContent") | ||||
| private String formulaContent; | private String formulaContent; | ||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| @@ -571,8 +571,8 @@ public class WxEnergyServiceImpl implements WxEnergyService { | |||||
| if (null != record.getFormulaContentList() && record.getFormulaContentList().size() > 0 ) { | if (null != record.getFormulaContentList() && record.getFormulaContentList().size() > 0 ) { | ||||
| msf.setFormulaContent(JSON.toJSONString(record.getFormulaContentList())); | 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()); | msf.setFormula(record.getFormula()); | ||||
| wxEnergyHelper.testCalcute(record.getFormula()); | wxEnergyHelper.testCalcute(record.getFormula()); | ||||
| @@ -592,7 +592,7 @@ public class WxEnergyServiceImpl implements WxEnergyService { | |||||
| fs.setFormulaContentList(JSON.parseArray(fs.getFormulaContent(), String.class)); | fs.setFormulaContentList(JSON.parseArray(fs.getFormulaContent(), String.class)); | ||||
| } | } | ||||
| if (StringUtils.isNotBlank(fs.getFormulaListStr())) { | if (StringUtils.isNotBlank(fs.getFormulaListStr())) { | ||||
| fs.setFormulaLis(JSON.parseArray(fs.getFormulaListStr(), String.class)); | |||||
| fs.setFormulaList(JSON.parseArray(fs.getFormulaListStr(), String.class)); | |||||
| } | } | ||||
| return fs; | return fs; | ||||
| } | } | ||||
| @@ -604,8 +604,8 @@ public class WxEnergyServiceImpl implements WxEnergyService { | |||||
| if (null != record.getFormulaContentList() && record.getFormulaContentList().size() > 0 ) { | if (null != record.getFormulaContentList() && record.getFormulaContentList().size() > 0 ) { | ||||
| record.setFormulaContent(JSON.toJSONString(record.getFormulaContentList())); | 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()); | wxEnergyHelper.testCalcute(record.getFormula()); | ||||
| wxEnergyFeesShopMapper.updateById(record); | wxEnergyFeesShopMapper.updateById(record); | ||||