问题修复
This commit is contained in:
@@ -10,6 +10,13 @@ spring:
|
|||||||
application:
|
application:
|
||||||
name: school-news-admin
|
name: school-news-admin
|
||||||
|
|
||||||
|
# 文件上传配置
|
||||||
|
servlet:
|
||||||
|
multipart:
|
||||||
|
enabled: true
|
||||||
|
max-file-size: 500MB
|
||||||
|
max-request-size: 500MB
|
||||||
|
|
||||||
# 数据源配置
|
# 数据源配置
|
||||||
datasource:
|
datasource:
|
||||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
driver-class-name: com.mysql.cj.jdbc.Driver
|
||||||
|
|||||||
@@ -5,8 +5,8 @@ spring:
|
|||||||
servlet:
|
servlet:
|
||||||
multipart:
|
multipart:
|
||||||
enabled: true
|
enabled: true
|
||||||
max-file-size: 100MB
|
max-file-size: 500MB
|
||||||
max-request-size: 100MB
|
max-request-size: 500MB
|
||||||
|
|
||||||
datasource:
|
datasource:
|
||||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
driver-class-name: com.mysql.cj.jdbc.Driver
|
||||||
|
|||||||
@@ -5,7 +5,10 @@ import org.slf4j.LoggerFactory;
|
|||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.util.StringUtils;
|
import org.springframework.util.StringUtils;
|
||||||
|
import org.xyzh.api.system.permission.ResourcePermissionService;
|
||||||
import org.xyzh.common.core.domain.ResultDomain;
|
import org.xyzh.common.core.domain.ResultDomain;
|
||||||
|
import org.xyzh.common.core.enums.ResourceType;
|
||||||
|
import org.xyzh.common.dto.permission.TbResourcePermission;
|
||||||
import org.xyzh.common.dto.permission.TbSysPermission;
|
import org.xyzh.common.dto.permission.TbSysPermission;
|
||||||
import org.xyzh.common.dto.role.TbSysRole;
|
import org.xyzh.common.dto.role.TbSysRole;
|
||||||
import org.xyzh.common.dto.user.TbSysUser;
|
import org.xyzh.common.dto.user.TbSysUser;
|
||||||
@@ -39,6 +42,9 @@ public class SysRoleServiceImpl implements SysRoleService {
|
|||||||
@Autowired
|
@Autowired
|
||||||
private RolePermissionMapper rolePermissionMapper;
|
private RolePermissionMapper rolePermissionMapper;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private ResourcePermissionService resourcePermissionService;
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
private UserDeptRoleMapper userDeptRoleMapper;
|
private UserDeptRoleMapper userDeptRoleMapper;
|
||||||
|
|
||||||
@@ -127,6 +133,22 @@ public class SysRoleServiceImpl implements SysRoleService {
|
|||||||
int result = roleMapper.insertRole(role);
|
int result = roleMapper.insertRole(role);
|
||||||
|
|
||||||
if (result > 0) {
|
if (result > 0) {
|
||||||
|
// 创建资源权限
|
||||||
|
try {
|
||||||
|
List<UserDeptRoleVO> userDeptRoles = LoginUtil.getCurrentDeptRole();
|
||||||
|
if (userDeptRoles != null && !userDeptRoles.isEmpty()) {
|
||||||
|
ResultDomain<TbResourcePermission> permissionResult = resourcePermissionService.createResourcePermission(
|
||||||
|
ResourceType.DEPT.getCode(),
|
||||||
|
role.getRoleID(),
|
||||||
|
userDeptRoles.get(0)
|
||||||
|
);
|
||||||
|
if (!permissionResult.isSuccess()) {
|
||||||
|
logger.warn("创建部门权限失败:{}", permissionResult.getMessage());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (Exception e) {
|
||||||
|
logger.error("创建部门权限异常", e);
|
||||||
|
}
|
||||||
logger.info("创建角色成功:{}", role.getName());
|
logger.info("创建角色成功:{}", role.getName());
|
||||||
resultDomain.success("创建角色成功", role);
|
resultDomain.success("创建角色成功", role);
|
||||||
return resultDomain;
|
return resultDomain;
|
||||||
|
|||||||
@@ -690,7 +690,7 @@ async function deleteRecommend(item: ResourceRecommendVO) {
|
|||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
await resourceRecommendApi.deleteRecommend(item.id!);
|
await resourceRecommendApi.deleteRecommend(item.resourceID!);
|
||||||
ElMessage.success('删除成功');
|
ElMessage.success('删除成功');
|
||||||
await refreshCurrentTab();
|
await refreshCurrentTab();
|
||||||
} catch (error: any) {
|
} catch (error: any) {
|
||||||
|
|||||||
@@ -181,7 +181,7 @@ function handleMoreClick(type: string) {
|
|||||||
} else if (type === 'ideological') {
|
} else if (type === 'ideological') {
|
||||||
router.push('/resource-center');
|
router.push('/resource-center');
|
||||||
} else if (type === 'learning') {
|
} else if (type === 'learning') {
|
||||||
router.push('/learning-center');
|
router.push('/user-center/learning-records');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user