Browse Source

777777777

zhouli 9 months ago
parent
commit
17d8649a77

+ 4 - 5
kd-service/kd-system/src/main/java/org/sky/system/service/impl/TenantServiceImpl.java

@@ -62,9 +62,8 @@ public class TenantServiceImpl extends BaseServiceImpl<TenantMapper, Tenant> imp
 	public IPage<Tenant> selectTenantPage(IPage<Tenant> page, Tenant tenant) {
 		List<Tenant> tenants = baseMapper.selectTenantPage(page, tenant);
 		for (Tenant t : tenants) {
-			if (Func.isNotEmpty(t.getRegionCode())) {
-				Region region = RegionCache.getByCode(t.getRegionCode());
-//				Region region = regionMapper.selectOne(Wrappers.<Region>lambdaQuery().eq(Region::getCode, t.getRegionCode()));
+			if (Func.isNotEmpty(t.getCityCode())) {
+				Region region = RegionCache.getByCode(t.getCityCode());
 				if (region != null) {
 					t.setRegionName(region.getProvinceName() + "-" + region.getCityName() + "-" + region.getDistrictName());
 				}
@@ -122,8 +121,8 @@ public class TenantServiceImpl extends BaseServiceImpl<TenantMapper, Tenant> imp
 		}
 		CacheUtil.clear(SYS_CACHE, tenant.getTenantId());
 		CacheUtil.evict(SYS_CACHE, TENANT_TENANT_ID, tenant.getTenantId(), Boolean.FALSE);
-		CacheUtil.clear("kd::vip:years:" + tenant.getTenantId(),Boolean.FALSE);
-
+//		CacheUtil.clear("kd::vip:years:" + tenant.getTenantId(),Boolean.FALSE);
+		redis.del("kd::vip:years:" + tenant.getTenantId());
 		return super.saveOrUpdate(tenant);
 	}