From 451de8ea263fa043ee0582e55d3c30c4ea364067 Mon Sep 17 00:00:00 2001 From: o2lee Date: Sat, 26 Sep 2020 15:37:33 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=86=85=E5=AE=B9=E7=AE=A1=E7=90=86]=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=9C=A8=E6=B2=A1=E6=9C=89=E8=AE=BE=E7=BD=AE=E4=B8=BB?= =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E6=97=B6=EF=BC=8C=E5=86=85=E5=AE=B9=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=92=8C=E8=80=83=E5=8B=A4=E7=AE=A1=E7=90=86=E4=B8=AD?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E7=94=A8=E6=88=B7=E5=90=8D=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=B8=BB=E8=BA=AB=E4=BB=BD=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=20[=E5=86=85=E5=AE=B9=E7=AE=A1=E7=90=86]=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=9C=A8=E6=B2=A1=E6=9C=89=E8=AE=BE=E7=BD=AE=E4=B8=BB?= =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E6=97=B6=EF=BC=8C=E5=86=85=E5=AE=B9=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=92=8C=E8=80=83=E5=8B=A4=E7=AE=A1=E7=90=86=E4=B8=AD?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E7=94=A8=E6=88=B7=E5=90=8D=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=B8=BB=E8=BA=AB=E4=BB=BD=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../control/service/UserManagerService.java | 12 +++++++----- .../document/ActionPersistPublishByWorkFlow.java | 2 +- .../document/ActionPersistPublishContent.java | 2 +- .../control/service/UserManagerService.java | 16 +++++++++------- 4 files changed, 18 insertions(+), 14 deletions(-) diff --git a/o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/service/UserManagerService.java b/o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/service/UserManagerService.java index d3ba5d8c68..4083ae68e8 100644 --- a/o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/service/UserManagerService.java +++ b/o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/service/UserManagerService.java @@ -385,13 +385,15 @@ public class UserManagerService { if (ListTools.isNotEmpty( identities )) { if( identities.size() == 1 ) { return identities.get(0); - } - for (String identity : identities) { - Identity obj = business.organization().identity().getObject(identity); - if (obj!= null && obj.getMajor() !=null && obj.getMajor() ) { - return identity; + }else{ + for (String identity : identities) { + Identity obj = business.organization().identity().getObject(identity); + if (obj.getMajor()) { + return identity; + } } } + return identities.get(0); } return null; } catch (Exception e) { diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionPersistPublishByWorkFlow.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionPersistPublishByWorkFlow.java index ff88dea4fb..6aa04530fe 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionPersistPublishByWorkFlow.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionPersistPublishByWorkFlow.java @@ -182,7 +182,7 @@ public class ActionPersistPublishByWorkFlow extends BaseAction { wi.setCreatorTopUnitName("xadmin"); }else { //尝试一下根据当前用户获取用户的第一个身份 - wi.setCreatorIdentity(userManagerService.getMajorIdentityWithPerson( effectivePerson.getDistinguishedName()) ); + wi.setCreatorIdentity( userManagerService.getMajorIdentityWithPerson( effectivePerson.getDistinguishedName()) ); } } diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionPersistPublishContent.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionPersistPublishContent.java index 56f53ddc42..ea518549e6 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionPersistPublishContent.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionPersistPublishContent.java @@ -199,7 +199,7 @@ public class ActionPersistPublishContent extends BaseAction { wi.setCreatorTopUnitName("xadmin"); }else { //尝试一下根据传入的用户或者当前用户获取用户的第一个身份 - wi.setCreatorIdentity(userManagerService.getMajorIdentityWithPerson( wi.getCreatorPerson() ) ); + wi.setCreatorIdentity( userManagerService.getMajorIdentityWithPerson( wi.getCreatorPerson() ) ); } } diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/service/UserManagerService.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/service/UserManagerService.java index 8e399fafa6..36558cc34b 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/service/UserManagerService.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/service/UserManagerService.java @@ -166,7 +166,7 @@ public class UserManagerService { * @return * @throws Exception */ - public String getMajorIdentityWithPerson(String personName) throws Exception { + public String getMajorIdentityWithPerson( String personName ) throws Exception { List identities = null; Business business = null; try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { @@ -179,16 +179,18 @@ public class UserManagerService { } } identities = business.organization().identity().listWithPerson(personName); - if (identities != null && !identities.isEmpty()) { + if (ListTools.isNotEmpty( identities )) { if( identities.size() == 1 ) { return identities.get(0); - } - for (String identity : identities) { - Identity obj = business.organization().identity().getObject(identity); - if (obj.getMajor()) { - return identity; + }else{ + for (String identity : identities) { + Identity obj = business.organization().identity().getObject(identity); + if (obj.getMajor()) { + return identity; + } } } + return identities.get(0); } return null; } catch (Exception e) { -- GitLab