'再次修改'

o2server/x_bbs_assemble_control/src/main/java/com/x/bbs/assemble/control/jaxrs/permissioninfo/ActionGetSectionOperationPermissoin.java

@@ -7,6 +7,8 @@ import com.x.base.core.project.http.ActionResult;
 import com.x.base.core.project.http.EffectivePerson;
 import com.x.base.core.project.logger.Logger;
 import com.x.base.core.project.logger.LoggerFactory;
+import com.x.base.core.project.organization.OrganizationDefinition;
+import com.x.bbs.assemble.control.Business;
 import com.x.bbs.assemble.control.jaxrs.permissioninfo.exception.ExceptionPermissionInfoProcess;
 import com.x.bbs.assemble.control.jaxrs.permissioninfo.exception.ExceptionSectionIdEmpty;
 import com.x.bbs.assemble.control.jaxrs.permissioninfo.exception.ExceptionSectionNotExists;
@@ -169,8 +171,10 @@ public class ActionGetSectionOperationPermissoin extends BaseAction {
 				wrap.setSectionConfigManageAble(true);
 			}
 			//是否是管理员
-			Boolean UserIsManager = UserPermissionService.getUserIsManager(effectivePerson);
-			if(UserIsManager) {
+			Business business = new Business(null);
+			Boolean userBBSManager = business.organization().person().hasRole(effectivePerson, OrganizationDefinition.BBSManager);
+			Boolean userManager = business.organization().person().hasRole(effectivePerson, OrganizationDefinition.Manager);
+			if(userBBSManager || userManager) {
 				wrap.setSubjectPublishAble(true);
 				wrap.setReplyPublishAble(true);
 				wrap.setReplyAuditAble(true);

o2server/x_bbs_assemble_control/src/main/java/com/x/bbs/assemble/control/jaxrs/permissioninfo/ActionGetSubjectOperationPermissoin.java

@@ -7,6 +7,8 @@ import com.x.base.core.project.http.ActionResult;
 import com.x.base.core.project.http.EffectivePerson;
 import com.x.base.core.project.logger.Logger;
 import com.x.base.core.project.logger.LoggerFactory;
+import com.x.base.core.project.organization.OrganizationDefinition;
+import com.x.bbs.assemble.control.Business;
 import com.x.bbs.assemble.control.jaxrs.permissioninfo.exception.ExceptionPermissionInfoProcess;
 import com.x.bbs.assemble.control.jaxrs.permissioninfo.exception.ExceptionSectionNotExists;
 import com.x.bbs.assemble.control.jaxrs.permissioninfo.exception.ExceptionSubjectIdEmpty;
@@ -172,8 +174,10 @@ public class ActionGetSubjectOperationPermissoin extends BaseAction {
 		}
 		
 		//是否是管理员
-		Boolean UserIsManager = UserPermissionService.getUserIsManager(effectivePerson);
-		if(UserIsManager) {
+		Business business = new Business(null);
+		Boolean userBBSManager = business.organization().person().hasRole(effectivePerson, OrganizationDefinition.BBSManager);
+		Boolean userManager = business.organization().person().hasRole(effectivePerson, OrganizationDefinition.Manager);
+		if(userBBSManager || userManager) {
 			wrap.setReplyPublishAble(true);
 			wrap.setAuditAble(true);
 			wrap.setManageAble(true);

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

@@ -41,35 +41,6 @@ public class UserPermissionService {
 	private BBSRoleInfoService roleInfoService = new BBSRoleInfoService();
 	private UserManagerService userManagerService = new UserManagerService();
 
-	
-	public Boolean getUserIsManager(EffectivePerson effectivePerson) {
-		boolean userIsManager = false;
-		String distinguishedName = effectivePerson.getDistinguishedName();
-		if(distinguishedName.equalsIgnoreCase("xadmin")) {
-			userIsManager = true;
-			return userIsManager;
-		}
-		String[] arrName = distinguishedName.split("@");
-		String uri = "person/" + arrName[1];
-		Class<x_organization_assemble_express> applicationClass = x_organization_assemble_express.class;
-		ActionResponse resp;
-		try {
-			resp = ThisApplication.context().applications().getQuery(applicationClass, uri);
-			JsonObject jsonObject = resp.getData().getAsJsonObject();
-			JsonArray woRoleList = jsonObject.get("woRoleList").getAsJsonArray();
-			for(JsonElement woRole:woRoleList) {
-				String unique =  woRole.getAsJsonObject().get("unique").getAsString();
-				if(unique.equalsIgnoreCase("ManagerSystemRole") || unique.equalsIgnoreCase("BSSManagerSystemRole")) {
-					userIsManager = true;
-					return userIsManager;
-				}
-			}
-		} catch (Exception e) {
-			logger.warn("系统根据员工查询论坛用户权限角色是否是管理员！");
-			logger.error(e);			
-		}
-		return userIsManager;
-	}
 	public Boolean hasPermission(String userName, String permissionCode) {
 		RoleAndPermission roleAndPermission = null;
 		List<String> permissionCodeList = null;