Browse Source

Merge branch 'fix/bss0721#257' into 'develop'

解决论坛停用分区后,在导航中还是会显示

See merge request o2oa/o2oa!1222
o2null 5 years ago
parent
commit
b69f65c084

+ 14 - 0
o2server/x_bbs_assemble_control/src/main/java/com/x/bbs/assemble/control/jaxrs/foruminfo/ActionGetAllWithPermission.java

@@ -1,6 +1,7 @@
 package com.x.bbs.assemble.control.jaxrs.foruminfo;
 
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
@@ -103,7 +104,20 @@ public class ActionGetAllWithPermission extends BaseAction {
 				forumInfoList = forumInfoServiceAdv.listAllViewAbleForumWithUserPermission( ids );
 				if( forumInfoList == null ){
 					forumInfoList = new ArrayList<BBSForumInfo>();
+				}else {
+					//排除“停用”
+					ArrayList<BBSForumInfo> bbsForumInfoList = new ArrayList<BBSForumInfo>();
+					Iterator<BBSForumInfo> it = forumInfoList.iterator();
+					while (it.hasNext()) {
+						BBSForumInfo forumInfo = it.next();
+						if(!forumInfo.getForumStatus().equalsIgnoreCase("停用")) {
+							bbsForumInfoList.add(forumInfo);
+						}
+					}
+					forumInfoList = bbsForumInfoList;
 				}
+				
+				
 			} catch (Exception e) {
 				Exception exception = new ExceptionForumInfoProcess( e, "根据ID列表查询论坛信息列表时发生异常。" );
 				result.error( exception );