yili/apps
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加小组成员隐式添加角色，删除小组成员隐式删除隐式角色

Browse Source
This commit is contained in:
anhc 2022-07-04 21:12:12 +08:00
parent 33aaa3b6b7
commit 94e39a1fc6
2 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
com.actionsoft.apps.coe.pal.cooperation/lib/com.actionsoft.apps.coe.pal.cooperation.jar
View File

Binary file not shown.

39
com.actionsoft.apps.coe.pal.cooperation/src/com/actionsoft/apps/coe/pal/cooperation/web/CooperationWeb.java
View File

@ -1219,19 +1219,32 @@ public class CooperationWeb extends ActionWeb {
} }
} }
if (!isOlderVersion){ if (!isOlderVersion){
CoeUser coeUserDao = new CoeUser(); //有额外的aws平台用户
//pal最大用户量许可 if (!awsUsers.isEmpty()){
int maxUser = Quota.getMaxCoEPALUser(); CoeUser coeUserDao = new CoeUser();
List<CoeUserModel> coeUsers = coeUserDao.getCoeUsers(); //pal最大用户量许可
if (maxUser < coeUsers.size() + awsUsers.size()){ int maxUser = Quota.getMaxCoEPALUser();
//超出最大用户量 List<CoeUserModel> coeUsers = coeUserDao.getCoeUsers();
return ResponseObject.newWarnResponse("用户数已超过许可总数(许可最大用户数" + maxUser + ")").toString(); if (maxUser < coeUsers.size() + awsUsers.size()){
//超出最大用户量
return ResponseObject.newWarnResponse("用户数已超过许可总数(许可最大用户数" + maxUser + ")").toString();
}
coeUserDao.batchInsert(awsUsers,false);
// 操作行为日志记录
if (SDK.getAppAPI().getPropertyBooleanValue(CoEConstant.APP_ID, "IS_RECORD_OP_LOG", false)) {
CoEOpLogAPI.auditOkOp(_uc, CoEOpLogConst.MODULE_CATEGORY_COOPERATION, CoEOpLogConst.OP_UPDATE, CoEOpLogConst.INFO_USER_CREATE);
}
} }
coeUserDao.batchInsert(awsUsers,false); //添加默认隐藏角色
// 操作行为日志记录 List<CoeCooperationRoleModel> roleList = new ArrayList<>();
if (SDK.getAppAPI().getPropertyBooleanValue(CoEConstant.APP_ID, "IS_RECORD_OP_LOG", false)) { Timestamp now = new Timestamp(System.currentTimeMillis());
CoEOpLogAPI.auditOkOp(_uc, CoEOpLogConst.MODULE_CATEGORY_COOPERATION, CoEOpLogConst.OP_UPDATE, CoEOpLogConst.INFO_USER_CREATE); for (CoeCooperationMemberModel memberModel : memberModels) {
CoeCooperationRoleModel roleModel = new CoeCooperationRoleModel(UUIDGener.getUUID(), teamId, memberModel.getUserId(),
"", 3, "", "", "", _uc.getUID(), now, _uc.getUID(), now,1);
roleList.add(roleModel);
} }
//批量插入用户隐藏角色
api.createCooperationRoles(roleList);
} }
// 保存 // 保存
api.createCooperationMemebers(memberModels); api.createCooperationMemebers(memberModels);
@ -1266,6 +1279,10 @@ public class CooperationWeb extends ActionWeb {
} }
for (int i = 0; i < userIdArr.size(); i++) { for (int i = 0; i < userIdArr.size(); i++) {
api.removeCooperationMemeber(teamId, userIdArr.getString(i)); api.removeCooperationMemeber(teamId, userIdArr.getString(i));
if (!SDK.getAppAPI().getPropertyBooleanValue("com.actionsoft.apps.coe.pal", "IsOlderVersion", true)){
//新版权限删除隐式用户角色
api.removeCooperationHideRole(teamId,userIdArr.getString(i));
}
} }
return ro.toString(); return ro.toString();
} }