添加默认角色teamworkmanager

o2server/x_base_core_project/src/main/java/com/x/base/core/project/organization/OrganizationDefinition.java

@@ -58,6 +58,9 @@ public class OrganizationDefinition {
 
 	public final static String CRMManager = "CRMManager";
 	public final static String CRMManager_discription = "CRM管理员(系统角色)，可以进行CRM系统相关配置，对客户信息，商机等信息进行管理操作。";
+	
+	public final static String TeamWorkManager = "TeamWorkManager";
+	public final static String TeamWorkManager_discription = "TeamWork管理员(系统角色)，可以进行TeamWork系统相关配置，对项目，任务等信息进行管理操作。";
 
 	public final static String QueryManager = "QueryManager";
 	public final static String QueryManager_discription = "数据中心管理员(系统角色)，可以在数据中心进行视图管理，统计管理等操作。";
@@ -94,7 +97,7 @@ public class OrganizationDefinition {
 	public final static List<String> DEFAULTROLES = new UnmodifiableList<String>(ListTools.toList(Manager,
 			AttendanceManager, OrganizationManager, PersonManager, GroupManager, UnitManager, RoleManager,
 			ProcessPlatformManager, ProcessPlatformCreator, MeetingManager, MeetingViewer, PortalManager, BBSManager,
-			CMSManager, OKRManager, CRMManager, QueryManager, MessageManager, HotPictureManager, SearchPrivilege));
+			CMSManager, OKRManager, CRMManager,TeamWorkManager, QueryManager, MessageManager, HotPictureManager, SearchPrivilege));
 
 	public static String name(String distinguishedName) {
 		if (StringUtils.contains(distinguishedName, "@")) {

o2server/x_program_center/src/main/java/com/x/program/center/Context.java

@@ -234,7 +234,7 @@ public class Context extends AbstractContext {
 				OrganizationDefinition.GroupManager, OrganizationDefinition.UnitManager,
 				OrganizationDefinition.RoleManager, OrganizationDefinition.ProcessPlatformManager,
 				OrganizationDefinition.ProcessPlatformCreator, OrganizationDefinition.MeetingManager,
-				OrganizationDefinition.PortalManager, OrganizationDefinition.BBSManager,
+				OrganizationDefinition.PortalManager, OrganizationDefinition.BBSManager,OrganizationDefinition.TeamWorkManager,
 				OrganizationDefinition.CMSManager, OrganizationDefinition.OKRManager, OrganizationDefinition.CRMManager,
 				OrganizationDefinition.QueryManager, OrganizationDefinition.MessageManager,
 				OrganizationDefinition.SearchPrivilege, OrganizationDefinition.HotPictureManager);
@@ -303,7 +303,9 @@ public class Context extends AbstractContext {
 			return OrganizationDefinition.OKRManager_discription;
 		} else if (OrganizationDefinition.CRMManager.equalsIgnoreCase(str)) {
 			return OrganizationDefinition.CRMManager_discription;
-		} else if (OrganizationDefinition.QueryManager.equalsIgnoreCase(str)) {
+		}else if (OrganizationDefinition.TeamWorkManager.equalsIgnoreCase(str)) {
+			return OrganizationDefinition.TeamWorkManager_discription;
+		}else if (OrganizationDefinition.QueryManager.equalsIgnoreCase(str)) {
 			return OrganizationDefinition.QueryManager_discription;
 		} else if (OrganizationDefinition.MessageManager.equalsIgnoreCase(str)) {
 			return OrganizationDefinition.MessageManager_discription;

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/global/ActionPriorityList.java

@@ -40,7 +40,7 @@ public class ActionPriorityList extends BaseAction {
 			}
 			result.setData(wos);
 		} catch (Exception e) {
-			Exception exception = new PriorityQueryException(e, "根据用户拥有的优先级信息列表时发生异常。");
+			Exception exception = new PriorityQueryException(e, "查询优先级信息列表时发生异常。");
 			result.error(exception);
 			logger.error(e, effectivePerson, request, null);
 		}

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/global/GlobalAction.java

@@ -224,4 +224,22 @@ public class GlobalAction extends StandardJaxrsAction {
 		asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
 	}
 	
+	@JaxrsMethodDescribe(value = "初始化优先级信息.", action = ActionInitConfig.class)
+	@GET
+	@Path("initConfig")
+	@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
+	@Consumes(MediaType.APPLICATION_JSON)
+	public void initConfig(@Suspended final AsyncResponse asyncResponse, 
+			@Context HttpServletRequest request) {
+		ActionResult<ActionInitConfig.Wo> result = new ActionResult<>();
+		EffectivePerson effectivePerson = this.effectivePerson(request);
+		try {
+			result = new ActionInitConfig().execute(request, effectivePerson);
+		} catch (Exception e) {
+			logger.error(e, effectivePerson, request, null);
+			result.error(e);
+		}
+		asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
+	}
+	
 }
\ No newline at end of file