|
@@ -82,16 +82,14 @@ public class RoleSceneInfoService extends SuperService {
|
|
|
List<RoleSceneInfo> list = new ArrayList<>();
|
|
List<RoleSceneInfo> list = new ArrayList<>();
|
|
|
List<String> projectSceneInfoIds = param.getProjectSceneInfoIds();
|
|
List<String> projectSceneInfoIds = param.getProjectSceneInfoIds();
|
|
|
if (ObjectUtils.isNotEmpty(projectSceneInfoIds)) {
|
|
if (ObjectUtils.isNotEmpty(projectSceneInfoIds)) {
|
|
|
- long i = roleSceneInfoDao.countByRoleId(role.getId()) + 1;
|
|
|
|
|
|
|
+ long i = 1;
|
|
|
for (String projectSceneInfoId : projectSceneInfoIds) {
|
|
for (String projectSceneInfoId : projectSceneInfoIds) {
|
|
|
// 项目的场景
|
|
// 项目的场景
|
|
|
ProjectSceneInfo projectSceneInfo = projectSceneInfoDao.findTopById(projectSceneInfoId);
|
|
ProjectSceneInfo projectSceneInfo = projectSceneInfoDao.findTopById(projectSceneInfoId);
|
|
|
if (ObjectUtils.isNotEmpty(projectSceneInfo)) {
|
|
if (ObjectUtils.isNotEmpty(projectSceneInfo)) {
|
|
|
RoleSceneInfo roleSceneInfo = buildProjectSceneInfo(projectSceneInfo, role);
|
|
RoleSceneInfo roleSceneInfo = buildProjectSceneInfo(projectSceneInfo, role);
|
|
|
- if (StringUtils.isEmpty(roleSceneInfo.getId())) {
|
|
|
|
|
- roleSceneInfo.setSort(i);
|
|
|
|
|
- i++;
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ roleSceneInfo.setSort(i);
|
|
|
|
|
+ i++;
|
|
|
list.add(roleSceneInfo);
|
|
list.add(roleSceneInfo);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|