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 d97cebc8..26ac8a21 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 c640fa33..9dbb353b 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 @@ -879,6 +879,10 @@ public class CooperationWeb extends ActionWeb { //新版权限具体文件的操作权限 List rolePermModels = api.queryCooperationRoleDataPermList(teamId, roleId); for (CoeCooperationRolePermModel rolePermModel : rolePermModels) { + if (rolePermModel.getActionPerm() == null){ + dataActionPerm.put(rolePermModel.getPalVersionId(),new ArrayList<>()); + continue; + } dataActionPerm.put(rolePermModel.getPalVersionId(), Arrays.asList(rolePermModel.getActionPerm().split(",").clone())); } } @@ -900,6 +904,7 @@ public class CooperationWeb extends ActionWeb { } ro.put("wsId", wsId); + ro.put("isOlderVersion", isOlderVersion); ro.put("roleName", roleName); ro.put("roleDesc", roleDesc); ro.put("roleType", roleType); @@ -1274,7 +1279,7 @@ public class CooperationWeb extends ActionWeb { } Timestamp now = new Timestamp(System.currentTimeMillis()); - CoeCooperationRoleModel roleModel = new CoeCooperationRoleModel(newRoleId, teamId, roleName, roleDesc, roleType, appPermStr, actionPermStr, dataPermStr, _uc.getUID(), now, _uc.getUID(), now); + CoeCooperationRoleModel roleModel = new CoeCooperationRoleModel(newRoleId, teamId, roleName, roleDesc, roleType, appPermStr, actionPermStr, dataPermStr, _uc.getUID(), now, _uc.getUID(), now,0); roleModel.setIsUser(0); boolean isSuccess = false; if (UtilString.isEmpty(roleId)) {// 新增