Merge branch '修复论坛修改昵称缓存未清除的问题' into 'develop'

修复论坛修改昵称缓存未清除的问题

See merge request o2oa/o2oa!114

o2server/x_bbs_assemble_control/src/main/java/com/x/bbs/assemble/control/queue/NickNameConsumeQueue.java

@@ -50,9 +50,6 @@ public class NickNameConsumeQueue extends AbstractQueue<String> {
 				logger.warn("更新帖子{}的昵称{}异常：{}",id, nickName, e.getMessage());
 			}
 		}
-		if(!subjectIds.isEmpty()){
-			CacheManager.notify(BBSSubjectInfo.class);
-		}
 		for(String id : replyIds){
 			try {
 				this.updateReplayNickName(id, nickName);
@@ -60,8 +57,8 @@ public class NickNameConsumeQueue extends AbstractQueue<String> {
 				logger.warn("更新回帖{}的昵称{}异常：{}",id, nickName, e.getMessage());
 			}
 		}
-		if(!replyIds.isEmpty()){
-			CacheManager.notify(BBSReplyInfo.class);
+		if(replyIds.size() > 0 || subjectIds.size() > 0){
+			CacheManager.notify(BBSSubjectInfo.class);
 		}
 	}
 

o2server/x_bbs_assemble_control/src/main/java/com/x/bbs/assemble/control/service/BBSUserInfoService.java

@@ -61,7 +61,7 @@ public class BBSUserInfoService {
 			userInfoList = business.userInfoFactory().listByUserName(userName);
 			if (ListTools.isNotEmpty(userInfoList)) {
 				BBSUserInfo o = userInfoList.get(0);
-				JpaObjectTools.detach(emc.get(BBSUserInfo.class), o);
+				emc.get(BBSUserInfo.class).detach(o);
 				return o;
 			} else {
 				return null;