From a05a7cdb168405172c06d66a861b40a1c5f77b9a Mon Sep 17 00:00:00 2001 From: winter <664946893@qq.com> Date: Sun, 15 Jun 2025 17:04:11 +0800 Subject: [PATCH] fix --- .../java/com/iformall/config/ShiroConfig.java | 2 +- .../controller/base/BaseController.java | 22 +++++++------- .../contract/WxAgileContractController.java | 2 +- .../service/WxAgileContractService.java | 2 +- .../impl/WxAgileContractServiceImpl.java | 30 ++++++++++--------- 5 files changed, 30 insertions(+), 28 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java b/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java index ab71e3397..3463ea458 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 247597318..fa0b4e34a 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/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxAgileContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxAgileContractController.java index 4e39896eb..0fe5ea89b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxAgileContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxAgileContractController.java @@ -242,7 +242,7 @@ public class WxAgileContractController extends WxContractBaseController { ResultData result = wxAgileContractService.saveOrUpdate(wxRentContract, user); //如果是有效的合同编辑,则复制其他设置到影子合同 if (result.code == Result.SUCCESS && null != oldRentContract && isValidEdit) { - wxAgileContractService.copyContractConfig(wxRentContract.getId(), oldRentContract, user, false); + wxAgileContractService.copyContractConfig(false,wxRentContract.getId(), oldRentContract, user, false); } return result; diff --git a/mallinkService/src/main/java/com/iformall/service/WxAgileContractService.java b/mallinkService/src/main/java/com/iformall/service/WxAgileContractService.java index c83344e03..f11a6edab 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxAgileContractService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxAgileContractService.java @@ -80,7 +80,7 @@ public interface WxAgileContractService { PageInfo getContractCustomersList(WxContractCustomers record, Integer pageIndex, Integer pageSize); - void copyContractConfig(Long destId,WxRentContract orgContract,MallUserInfo user,boolean isReBuildUnDeposit); + void copyContractConfig(boolean copyContractShop,Long destId,WxRentContract orgContract,MallUserInfo user,boolean isReBuildUnDeposit); void renewalAgile(WxRentContract wxRentContract,MallUserInfo user); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxAgileContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxAgileContractServiceImpl.java index b873c763b..408a8d09e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxAgileContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxAgileContractServiceImpl.java @@ -1075,20 +1075,22 @@ public class WxAgileContractServiceImpl implements WxAgileContractService { @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) @Override - public void copyContractConfig(Long destId,WxRentContract orgContract,MallUserInfo user,boolean isReBuildUnDeposit) { + public void copyContractConfig(boolean copyContractShop,Long destId,WxRentContract orgContract,MallUserInfo user,boolean isReBuildUnDeposit) { final IdWorker idWorker = IdWorker.get(); - WxContractShop csq = new WxContractShop(); - csq.updateTenantInfo(user); - csq.setContractId(orgContract.getId()); - List csqlist = wxContractShopMapper.findList(csq); - if (null != csqlist && csqlist.size() > 0 ){ - for ( int i = 0 ; i< csqlist.size() ; i ++) { - WxContractShop cs = csqlist.get(i); - cs.setId(idWorker.nextId()); - cs.setContractId(destId); - cs.setCreateDate(new Date()); - cs.setUpdateDate(new Date()); - wxContractShopMapper.insert(cs); + if (copyContractShop) { + WxContractShop csq = new WxContractShop(); + csq.updateTenantInfo(user); + csq.setContractId(orgContract.getId()); + List csqlist = wxContractShopMapper.findList(csq); + if (null != csqlist && csqlist.size() > 0 ){ + for ( int i = 0 ; i< csqlist.size() ; i ++) { + WxContractShop cs = csqlist.get(i); + cs.setId(idWorker.nextId()); + cs.setContractId(destId); + cs.setCreateDate(new Date()); + cs.setUpdateDate(new Date()); + wxContractShopMapper.insert(cs); + } } } @@ -1270,7 +1272,7 @@ public class WxAgileContractServiceImpl implements WxAgileContractService { rentContract.setLease(array[0]); wxRentContractMapper.insert(rentContract); - copyContractConfig(newContractId, rentContract, user, true); + copyContractConfig(true,newContractId, rentContract, user, true); } private WxRentContractAgileRenevueItem generateRenevueItem(IdWorker idWorker,WxRentContract rentContract,Long newContractId,Long renevueId) {