Commit ccfa0e3c LN

文字显示修改,bug修改

1 个父辈 169414f6
...@@ -71,10 +71,10 @@ public class DataInitManager { ...@@ -71,10 +71,10 @@ public class DataInitManager {
Set<String> groupIds = new HashSet<>(); Set<String> groupIds = new HashSet<>();
Role role = new Role(menuIdSet, "admin", "管理员"); Role role = new Role(menuIdSet, "admin", "admin");
role = roleManager.save(role); role = roleManager.save(role);
log.info("创建默认角色:" + role.toString()); log.info("创建默认角色:" + role.toString());
Role operator = new Role(menuIdSet, "operator", "操作员"); Role operator = new Role(menuIdSet, "operator", "operator");
operator = roleManager.save(operator); operator = roleManager.save(operator);
log.info("创建默认角色:" + operator.toString()); log.info("创建默认角色:" + operator.toString());
......
...@@ -650,6 +650,18 @@ public class DataCache { ...@@ -650,6 +650,18 @@ public class DataCache {
return storageIds; return storageIds;
} }
public void clearGroup(String groupId){
if(ObjectUtil.isEmpty(groupId)||groupId.equals("-1")){
return;
}
for (String key :
allStorage.keySet()) {
if(allStorage.get(key).getGroupId().equals(groupId)){
allStorage.get(key).setGroupId("");
}
}
}
public List<String> getAvailableStorageIds(){ public List<String> getAvailableStorageIds(){
List<String> availableStorageIds = new ArrayList<>(); List<String> availableStorageIds = new ArrayList<>();
for (Storage storage : getAllStorage().values()) { for (Storage storage : getAllStorage().values()) {
......
...@@ -176,6 +176,8 @@ public class GroupController { ...@@ -176,6 +176,8 @@ public class GroupController {
storageManager.clearStorageGroup(group.getId()); storageManager.clearStorageGroup(group.getId());
userManager.clearUserGroup(group.getId()); userManager.clearUserGroup(group.getId());
groupManager.delete(group); groupManager.delete(group);
dataCache.clearGroup(group.getId());
} }
return new ResponseEntity<>(HttpStatus.OK); return new ResponseEntity<>(HttpStatus.OK);
} }
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!