diff --git a/com.actionsoft.apps.coe.pal.cooperation/lib/com.actionsoft.apps.coe.pal.cooperation.jar b/com.actionsoft.apps.coe.pal.cooperation/lib/com.actionsoft.apps.coe.pal.cooperation.jar index 2938a7fc..910cebcf 100644 Binary files a/com.actionsoft.apps.coe.pal.cooperation/lib/com.actionsoft.apps.coe.pal.cooperation.jar and b/com.actionsoft.apps.coe.pal.cooperation/lib/com.actionsoft.apps.coe.pal.cooperation.jar differ diff --git a/com.actionsoft.apps.coe.pal.cooperation/src/com/actionsoft/apps/coe/pal/cooperation/dto/CooperationManageListTeamMemberDto.java b/com.actionsoft.apps.coe.pal.cooperation/src/com/actionsoft/apps/coe/pal/cooperation/dto/CooperationManageListTeamMemberDto.java index 72eaf52e..41b13dce 100644 --- a/com.actionsoft.apps.coe.pal.cooperation/src/com/actionsoft/apps/coe/pal/cooperation/dto/CooperationManageListTeamMemberDto.java +++ b/com.actionsoft.apps.coe.pal.cooperation/src/com/actionsoft/apps/coe/pal/cooperation/dto/CooperationManageListTeamMemberDto.java @@ -26,6 +26,8 @@ public class CooperationManageListTeamMemberDto { private int roleType; private List roleTypes = new ArrayList<>(); private List roleIds = new ArrayList<>(); + private boolean isOlderVersion; + private boolean hasUserPerm; public CooperationManageListTeamMemberDto() { } @@ -143,4 +145,20 @@ public class CooperationManageListTeamMemberDto { public void setRoleIds(List roleIds) { this.roleIds = roleIds; } + + public boolean getIsOlderVersion() { + return isOlderVersion; + } + + public void setIsOlderVersion(boolean olderVersion) { + isOlderVersion = olderVersion; + } + + public boolean getHasUserPerm() { + return hasUserPerm; + } + + public void setHasUserPerm(boolean hasUserPerm) { + this.hasUserPerm = hasUserPerm; + } } diff --git a/com.actionsoft.apps.coe.pal.cooperation/src/com/actionsoft/apps/coe/pal/cooperation/web/CooperationWeb.java b/com.actionsoft.apps.coe.pal.cooperation/src/com/actionsoft/apps/coe/pal/cooperation/web/CooperationWeb.java index d3970459..3df9e9bb 100644 --- a/com.actionsoft.apps.coe.pal.cooperation/src/com/actionsoft/apps/coe/pal/cooperation/web/CooperationWeb.java +++ b/com.actionsoft.apps.coe.pal.cooperation/src/com/actionsoft/apps/coe/pal/cooperation/web/CooperationWeb.java @@ -660,6 +660,8 @@ public class CooperationWeb extends ActionWeb { } dto.addRoleName(role.getRoleName()); dto.getRoleTypes().add(role.getRoleType()); + dto.setIsOlderVersion(SDK.getAppAPI().getPropertyBooleanValue("com.actionsoft.apps.coe.pal", "IsOlderVersion", true)); + dto.setHasUserPerm(new CoeCooperationRoleDao().getCooperationHideRoleByRoleName(teamId,member.getUserId()) != null); userMap.put(user.getUID(),dto); } }