其他权限修改

base-servers/account/account-server/src/main/java/com/usoftchina/saas/account/service/impl/RoleServiceImpl.java

@@ -108,33 +108,12 @@ public class RoleServiceImpl extends CommonBaseServiceImpl<RoleMapper, Role> imp
                     String classify = String.valueOf(map.get("classify"));
                     //角色有权限的,设置为true
                     setPowerValue(powerDTO, classify, true);
-                    setOtherPower(powerDTO, powerInfo.getGrougId(), id, otherPowerList);
                 }
+                //设置其他权限
+                setOtherPower(powerDTO, powerInfo.getGrougId(), id, otherPowerList);
             }
             powerDTOList.add(powerDTO);
         }
-
-        /*//查询所有模块
-        List<ResourceModule> modules = resourceModuleMapper.selectByAppId(BaseContextHolder.getAppId());
-        for (ResourceModule module : modules){
-            //查询所有分组
-            List<ResourceGroup> groups = resourceGroupMapper.selectByModuleId(module.getId());
-            for (ResourceGroup group : groups) {
-                PowerDTO powerDTO = new PowerDTO();
-                powerDTO.setGroupId(group.getId());
-                powerDTO.setModuleName(module.getName());
-                powerDTO.setGroupName(group.getName());
-                //赋值权限
-                for (Map<String, Object> map : classifyList){
-                    if (group.getId().equals(map.get("group_id"))){
-                        String classify = String.valueOf(map.get("classify"));
-                        setPowerValue(powerDTO, classify);
-                        setOtherPower(powerDTO, group.getId(), id, otherPowerList);
-                    }
-                }
-                powerDTOList.add(powerDTO);
-            }
-        }*/
         return powerDTOList;
     }