From 952cd57235bdd49ca86b228f240c0312abe18b86 Mon Sep 17 00:00:00 2001 From: winter Date: Sat, 25 May 2024 17:38:49 +0800 Subject: [PATCH] fix --- .../java/com/iformall/config/ShiroConfig.java | 2 +- .../controller/base/BaseController.java | 22 +++++++++---------- .../impl/WxBillOtherDepositServiceImpl.java | 8 +++---- .../service/impl/WxBillOtherServiceImpl.java | 4 ++-- .../resources/mapper/WxBillDepositMapper.xml | 2 +- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java b/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java index b031c8ce9..665b9c906 100644 --- a/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java +++ b/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java @@ -162,7 +162,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/service/impl/WxBillOtherDepositServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java index 43c9f6d1e..e01e5d71a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java @@ -249,8 +249,8 @@ public class WxBillOtherDepositServiceImpl extends WxBillBaseService implements otherDepositQuery.setReceiveDate(record.getReceiveDate()); otherDepositQuery.setComments(record.getComments()); otherDepositQuery.setIsDel(EnumDelStatus.NOT_DEL.getCode()); - WxBillOtherDeposit otherDeposit = wxBillOtherDepositMapper.selectOne(new QueryWrapper(otherDepositQuery)); - if (otherDeposit != null) { + List otherDeposit = wxBillOtherDepositMapper.findList(otherDepositQuery); + if (otherDeposit != null && otherDeposit.size() > 0 ) { return new ResultData(ErrorCode.BILL_IS_FOUND); } @@ -276,8 +276,8 @@ public class WxBillOtherDepositServiceImpl extends WxBillBaseService implements if (wxBillOtherDeposit == null) { return new ResultData(ErrorCode.BILL_ROUTINE_IS_NOT_FOUND); } - wxBillOtherDeposit.setUpdatetime(date); - wxBillOtherDepositMapper.updateById(wxBillOtherDeposit); + record.setUpdatetime(date); + wxBillOtherDepositMapper.updateById(record); return new ResultData(Result.SUCCESS, "更新其他账单成功"); } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java index 002ae82bc..93f0af26e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java @@ -276,8 +276,8 @@ public class WxBillOtherServiceImpl extends WxBillBaseService implements WxBillO if(wxBillOther==null){ return new ResultData(ErrorCode.BILL_ROUTINE_IS_NOT_FOUND); } - wxBillOther.setUpdatetime(date); - wxBillOtherMapper.updateById(wxBillOther); + record.setUpdatetime(date); + wxBillOtherMapper.updateById(record); return new ResultData(Result.SUCCESS, "更新其他押金账单成功"); } } diff --git a/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml b/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml index e4c86e643..4f4f10463 100644 --- a/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml @@ -317,6 +317,6 @@ delete from wx_bill_rent_deposit where id = #{id} and tenant_id = #{tenantId} - +