Merge branch 'cherry-pick-2e4f1342' into 'develop'

修复代理无法终止流程.

See merge request o2oa/o2oa!2600

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

@@ -56,7 +56,12 @@ class V2Terminate extends BaseAction {
 			String identity = business.organization().identity()
 					.getMajorWithPerson(effectivePerson.getDistinguishedName());
 			if (StringUtils.isEmpty(identity)) {
-				throw new ExceptionEmptyIdentity(effectivePerson.getDistinguishedName());
+				// 如果直接报错,那么管理员和cipher无法进行终止.
+				if (effectivePerson.isManager()) {
+					identity = effectivePerson.getDistinguishedName();
+				} else {
+					throw new ExceptionEmptyIdentity(effectivePerson.getDistinguishedName());
+				}
 			}
 			param.distinguishedName = identity;
 			Control control = new WorkControlBuilder(effectivePerson, business, work).enableAllowManage()