winter 3 лет назад
Родитель
Сommit
ac497a4e66
3 измененных файлов: 7 добавлений и 3 удалений
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java
  2. +4
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java
  3. +2
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java Просмотреть файл

@@ -162,7 +162,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);


+ 4
- 2
mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java Просмотреть файл

@@ -73,8 +73,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 = (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);


+ 2
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java Просмотреть файл

@@ -647,6 +647,7 @@ public class WxRentContractServiceImpl implements WxRentContractService {
bill.setLatePayRatio(0); bill.setLatePayRatio(0);
bill.setPay(0L); bill.setPay(0L);
bill.setIsDel(EnumDelStatus.NOT_DEL.getCode()); bill.setIsDel(EnumDelStatus.NOT_DEL.getCode());
bill.setMerchantId(record.getMerchantId());
if (null != shopIds && shopIds.size() == 1) { if (null != shopIds && shopIds.size() == 1) {
bill.setShopId(shopIds.get(0)); bill.setShopId(shopIds.get(0));
} }
@@ -708,6 +709,7 @@ public class WxRentContractServiceImpl implements WxRentContractService {
bill.setLatePayRatio(0); bill.setLatePayRatio(0);
bill.setPay(0L); bill.setPay(0L);
bill.setIsDel(EnumDelStatus.NOT_DEL.getCode()); bill.setIsDel(EnumDelStatus.NOT_DEL.getCode());
bill.setMerchantId(record.getMerchantId());
if (null != shopIds && shopIds.size() == 1) { if (null != shopIds && shopIds.size() == 1) {
bill.setShopId(shopIds.get(0)); bill.setShopId(shopIds.get(0));
} }


Загрузка…
Отмена
Сохранить