Merge branch 'fix/查询角色身份关联的组织信息未返回' into 'wrdp'

[人员组织]修复查询角色身份关联的组织信息未返回的问题

See merge request o2oa/o2oa!2127

o2server/x_organization_assemble_express/src/main/java/com/x/organization/assemble/express/jaxrs/unitduty/ActionListIdentityWithUnitWithNameObject.java

@@ -196,14 +196,13 @@ class ActionListIdentityWithUnitWithNameObject extends BaseAction {
 					matchUnit = business.unit().pick(o.getUnit());
 					unitMap.put(matchUnit.getId(), matchUnit);
 				}
-				/*Unit unit = unitMap.get(identity.getUnit());
+				Unit unit = unitMap.get(identity.getUnit());
 				if(unit == null){
 					unit = business.unit().pick(identity.getUnit());
 					unitMap.put(unit.getId(), unit);
 				}
 				Person person = business.person().pick(identity.getPerson());
-				 */
-				Wo wo = this.convertToIdentity(matchUnit, null, null, identity);
+				Wo wo = this.convertToIdentity(matchUnit, unit, person, identity);
 				wos.add(wo);
 			}
 		}