WANG 5 gadi atpakaļ
vecāks
revīzija
c0f31fa5ad

+ 7 - 0
examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/controller/OrgController.java

@@ -63,6 +63,7 @@ import cn.com.qmth.examcloud.core.basic.dao.entity.OrgPropertyEntity;
 import cn.com.qmth.examcloud.core.basic.dao.enums.OrgProperty;
 import cn.com.qmth.examcloud.core.basic.service.bean.OrgInfo;
 import cn.com.qmth.examcloud.core.basic.service.cache.OrgCache;
+import cn.com.qmth.examcloud.core.basic.service.cache.RootOrgCache;
 import cn.com.qmth.examcloud.core.basic.service.cache.SystemPropertyCache;
 import cn.com.qmth.examcloud.core.basic.service.impl.OrgServiceImpl;
 import cn.com.qmth.examcloud.exchange.inner.api.UpyunCloudService;
@@ -95,6 +96,9 @@ public class OrgController extends ControllerSupport {
 	@Autowired
 	OrgCache orgCache;
 
+	@Autowired
+	RootOrgCache rootOrgCache;
+
 	@Autowired
 	RedisClient redisClient;
 
@@ -1024,6 +1028,9 @@ public class OrgController extends ControllerSupport {
 
 		for (OrgEntity saved : savedList) {
 			orgCache.remove(saved.getId());
+			if (null != saved.getDomainName()) {
+				rootOrgCache.remove(saved.getDomainName());
+			}
 		}
 	}
 

+ 10 - 0
examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/impl/OrgServiceImpl.java

@@ -38,6 +38,7 @@ import cn.com.qmth.examcloud.core.basic.dao.enums.OrgProperty;
 import cn.com.qmth.examcloud.core.basic.service.OrgService;
 import cn.com.qmth.examcloud.core.basic.service.bean.OrgInfo;
 import cn.com.qmth.examcloud.core.basic.service.cache.OrgCache;
+import cn.com.qmth.examcloud.core.basic.service.cache.RootOrgCache;
 import cn.com.qmth.examcloud.task.api.DataSyncCloudService;
 import cn.com.qmth.examcloud.task.api.request.SyncOrgReq;
 import cn.com.qmth.examcloud.web.helpers.GlobalHelper;
@@ -54,6 +55,9 @@ public class OrgServiceImpl implements OrgService {
 	@Autowired
 	OrgCache orgCache;
 
+	@Autowired
+	RootOrgCache rootOrgCache;
+
 	@Autowired
 	UserRepo userRepo;
 
@@ -157,6 +161,9 @@ public class OrgServiceImpl implements OrgService {
 		saveOrgProperties(saved.getId(), properties);
 
 		orgCache.remove(saved.getId());
+		if (null != saved.getDomainName()) {
+			rootOrgCache.remove(saved.getDomainName());
+		}
 
 		return saved;
 	}
@@ -253,6 +260,9 @@ public class OrgServiceImpl implements OrgService {
 		saveOrgProperties(saved.getId(), properties);
 
 		orgCache.remove(saved.getId());
+		if (null != saved.getDomainName()) {
+			rootOrgCache.remove(saved.getDomainName());
+		}
 
 		return saved;
 	}