Merge branch 'cherry-pick-d8a89085' into 'wrdp'

Merge branch 'hotfix/人员组织导入返回结果集缓存存储错及读取错误' into 'master'

See merge request o2oa/o2oa!1780

o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/inputperson/ActionGetResult.java

@@ -17,7 +17,7 @@ public class ActionGetResult extends BaseAction {
 	protected ActionResult<Wo> execute(EffectivePerson effectivePerson, String flag) throws Exception {
 		logger.debug(effectivePerson, "flag:{}.", flag);
 		ActionResult<Wo> result = new ActionResult<>();
-		CacheKey cacheKey = new CacheKey(this.getClass(), flag);
+		CacheKey cacheKey = new CacheKey(flag);
 		Optional<?> optional = CacheManager.get(this.cache, cacheKey);
 		if (!optional.isPresent()) {
 			throw new ExceptionResultNotFound(flag);

o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/inputperson/ActionInput.java

@@ -67,8 +67,8 @@ class ActionInput extends BaseAction {
 			cacheInputResult.setName(name);
 			cacheInputResult.setBytes(os.toByteArray());
 			String flag = StringTools.uniqueToken();
-			CacheKey cacheKey = new CacheKey(this.getClass(), flag);
-			CacheManager.put(business.cache(), cacheKey, cacheInputResult);
+			CacheKey cacheKey = new CacheKey(flag);
+			CacheManager.put(this.cache, cacheKey, cacheInputResult);
 			CacheManager.notify(Person.class);
 			CacheManager.notify(Group.class);
 			CacheManager.notify(Role.class);

o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/inputperson/ActionInputAll.java

@@ -101,8 +101,8 @@ class ActionInputAll extends BaseAction {
 			cacheInputResult.setName(name);
 			cacheInputResult.setBytes(os.toByteArray());
 			String flag = StringTools.uniqueToken();
-			CacheKey cacheKey = new CacheKey(this.getClass(), flag);
-			CacheManager.put(business.cache(), cacheKey, cacheInputResult);
+			CacheKey cacheKey = new CacheKey(flag);
+			CacheManager.put(this.cache, cacheKey, cacheInputResult);
 			CacheManager.notify(Person.class);
 			CacheManager.notify(Group.class);
 			CacheManager.notify(Role.class);