Merge branch 'fix/conflact' into 'wrdp'

Fix/conflact

See merge request o2oa/o2oa!2287

o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/V2GetWorkOrWorkCompleted2.java

@@ -84,10 +84,12 @@ class V2GetWorkOrWorkCompleted2 extends BaseAction {
 				return value;
 			});
 
+ 
 			if (BooleanUtils.isFalse(_control.get())) {
 				throw new ExceptionAccessDenied(effectivePerson, workOrWorkCompleted);
 			}
 			result.setData(_wo.get());
+ 
 			return result;
 		}
 	}

o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/WorkAction.java

@@ -1275,7 +1275,8 @@ public class WorkAction extends StandardJaxrsAction {
 		asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
 	}
 	
-	@JaxrsMethodDescribe(value = "V2_根据Work或workCompleted取得内容.", action = V2GetWorkOrWorkCompleted2.class)
+ 
+	@JaxrsMethodDescribe(value = "V2_根据Work或workCompleted取得内容2.", action = V2GetWorkOrWorkCompleted2.class)
 	@GET
 	@Path("v2/workorworkcompleted2/{workOrWorkCompleted}")
 	@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)