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 0ef0fa1b..ff605794 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/web/CooperationWeb.java b/com.actionsoft.apps.coe.pal.cooperation/src/com/actionsoft/apps/coe/pal/cooperation/web/CooperationWeb.java index 56bf1f60..348f7a13 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 @@ -645,9 +645,11 @@ public class CooperationWeb extends ActionWeb { JSONArray userArr = JSONArray.parseArray(userIds); CoeCooperationMemberDao memberDao = new CoeCooperationMemberDao(); for (int i = 0; i < userArr.size(); i++) { - CoeCooperationMemberModel memberModel = memberDao.getModelByTeamUser(teamId, userArr.getString(i)); - if (memberModel != null) { - roleIds.add(memberModel.getRoleId()); + List teamRoles = memberDao.getTeamRolesByUser(teamId, userArr.getString(i)); + if (teamRoles != null && !teamRoles.isEmpty()) { + for (CoeCooperationMemberModel teamRole : teamRoles) { + roleIds.add(teamRole.getRoleId()); + } } } List dtoList = new ArrayList<>();