diff --git a/ruoyi-ui/src/assets/styles/ruoyi.scss b/ruoyi-ui/src/assets/styles/ruoyi.scss index 0c2919b9..a5bcbb95 100644 --- a/ruoyi-ui/src/assets/styles/ruoyi.scss +++ b/ruoyi-ui/src/assets/styles/ruoyi.scss @@ -57,12 +57,16 @@ margin-top: 6vh !important; } -.el-table .el-table__header-wrapper th { - word-break: break-word; - background-color: #f8f8f9; - color: #515a6e; - height: 40px; - font-size: 13px; +.el-table { + .el-table__header-wrapper, .el-table__fixed-header-wrapper { + th { + word-break: break-word; + background-color: #f8f8f9; + color: #515a6e; + height: 40px; + font-size: 13px; + } + } } /** 表单布局 **/ @@ -138,7 +142,7 @@ padding-left: 15px; margin-bottom: 10px; } - + /* text color */ .text-navy { color: #1ab394; @@ -194,4 +198,4 @@ opacity: .8; color: #fff!important; background: #42b983!important; -} +} \ No newline at end of file diff --git a/ruoyi-ui/src/components/HeaderSearch/index.vue b/ruoyi-ui/src/components/HeaderSearch/index.vue index af047168..3b4790d0 100644 --- a/ruoyi-ui/src/components/HeaderSearch/index.vue +++ b/ruoyi-ui/src/components/HeaderSearch/index.vue @@ -70,7 +70,12 @@ export default { this.show = false }, change(val) { - this.$router.push(val.path) + if(this.ishttp(val.path)) { + // http(s):// 路径新窗口打开 + window.open(val.path, "_blank"); + } else { + this.$router.push(val.path) + } this.search = '' this.options = [] this.$nextTick(() => { @@ -104,7 +109,7 @@ export default { if (router.hidden) { continue } const data = { - path: path.resolve(basePath, router.path), + path: !this.ishttp(router.path) ? path.resolve(basePath, router.path) : router.path, title: [...prefixTitle] } @@ -134,6 +139,9 @@ export default { } else { this.options = [] } + }, + ishttp(url) { + return url.indexOf('http://') !== -1 || url.indexOf('https://') !== -1 } } } diff --git a/ruoyi-ui/src/components/IconSelect/index.vue b/ruoyi-ui/src/components/IconSelect/index.vue index 0611dc5a..b0ec9fa1 100644 --- a/ruoyi-ui/src/components/IconSelect/index.vue +++ b/ruoyi-ui/src/components/IconSelect/index.vue @@ -25,10 +25,9 @@ export default { }, methods: { filterIcons() { + this.iconList = icons if (this.name) { this.iconList = this.iconList.filter(item => item.includes(this.name)) - } else { - this.iconList = icons } }, selectedIcon(name) { diff --git a/ruoyi-ui/src/permission.js b/ruoyi-ui/src/permission.js index d4f6ae46..00c2f3ee 100644 --- a/ruoyi-ui/src/permission.js +++ b/ruoyi-ui/src/permission.js @@ -53,7 +53,7 @@ router.beforeEach((to, from, next) => { // 在免登录白名单，直接进入 next() } else { - next(`/login?redirect=${to.path}`) // 否则全部重定向到登录页 + next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页 NProgress.done() } } diff --git a/ruoyi-ui/src/views/monitor/job/index.vue b/ruoyi-ui/src/views/monitor/job/index.vue index c5f2f40f..061dfbeb 100644 --- a/ruoyi-ui/src/views/monitor/job/index.vue +++ b/ruoyi-ui/src/views/monitor/job/index.vue @@ -133,7 +133,7 @@ - + @@ -481,4 +481,4 @@ export default { } } }; - + \ No newline at end of file diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue index ec0a789b..c9e89c1b 100644 --- a/ruoyi-ui/src/views/system/user/index.vue +++ b/ruoyi-ui/src/views/system/user/index.vue @@ -208,7 +208,7 @@ - + diff --git a/ruoyi/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java b/ruoyi/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java index c976d959..3ca634d6 100644 --- a/ruoyi/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java +++ b/ruoyi/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java @@ -52,6 +52,11 @@ public class DataScopeAspect */ public static final String DATA_SCOPE_SELF = "5"; + /** + * 数据权限过滤关键字 + */ + public static final String DATA_SCOPE = "dataScope"; + // 配置织入点 @Pointcut("@annotation(com.ruoyi.framework.aspectj.lang.annotation.DataScope)") public void dataScopePointCut() @@ -138,7 +143,7 @@ public class DataScopeAspect if (StringUtils.isNotBlank(sqlString.toString())) { BaseEntity baseEntity = (BaseEntity) joinPoint.getArgs()[0]; - baseEntity.setDataScope(" AND (" + sqlString.substring(4) + ")"); + baseEntity.getParams().put(DATA_SCOPE, " AND (" + sqlString.substring(4) + ")"); } } diff --git a/ruoyi/src/main/java/com/ruoyi/framework/web/domain/BaseEntity.java b/ruoyi/src/main/java/com/ruoyi/framework/web/domain/BaseEntity.java index 24beda05..028d2959 100644 --- a/ruoyi/src/main/java/com/ruoyi/framework/web/domain/BaseEntity.java +++ b/ruoyi/src/main/java/com/ruoyi/framework/web/domain/BaseEntity.java @@ -36,9 +36,6 @@ public class BaseEntity implements Serializable /** 备注 */ private String remark; - /** 数据权限 */ - private String dataScope; - /** 开始时间 */ @JsonIgnore private String beginTime; @@ -110,16 +107,6 @@ public class BaseEntity implements Serializable this.remark = remark; } - public String getDataScope() - { - return dataScope; - } - - public void setDataScope(String dataScope) - { - this.dataScope = dataScope; - } - public String getBeginTime() { return beginTime; diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysPostController.java b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysPostController.java index 5bce6a6f..5d17f5e8 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysPostController.java +++ b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysPostController.java @@ -48,7 +48,7 @@ public class SysPostController extends BaseController } @Log(title = "岗位管理", businessType = BusinessType.EXPORT) - @PreAuthorize("@ss.hasPermi('system:config:export')") + @PreAuthorize("@ss.hasPermi('system:post:export')") @GetMapping("/export") public AjaxResult export(SysPost post) { diff --git a/ruoyi/src/main/resources/mybatis/system/SysDeptMapper.xml b/ruoyi/src/main/resources/mybatis/system/SysDeptMapper.xml index a07d8a0d..32d11aed 100644 --- a/ruoyi/src/main/resources/mybatis/system/SysDeptMapper.xml +++ b/ruoyi/src/main/resources/mybatis/system/SysDeptMapper.xml @@ -40,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND status = #{status} - ${dataScope} + ${params.dataScope} order by d.parent_id, d.order_num diff --git a/ruoyi/src/main/resources/mybatis/system/SysDictDataMapper.xml b/ruoyi/src/main/resources/mybatis/system/SysDictDataMapper.xml index 0b341a7f..8221d6e0 100644 --- a/ruoyi/src/main/resources/mybatis/system/SysDictDataMapper.xml +++ b/ruoyi/src/main/resources/mybatis/system/SysDictDataMapper.xml @@ -38,6 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND status = #{status} + order by dict_sort asc diff --git a/ruoyi/src/main/resources/mybatis/system/SysUserMapper.xml b/ruoyi/src/main/resources/mybatis/system/SysUserMapper.xml index 4ee6d8fd..449fa034 100644 --- a/ruoyi/src/main/resources/mybatis/system/SysUserMapper.xml +++ b/ruoyi/src/main/resources/mybatis/system/SysUserMapper.xml @@ -78,7 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE FIND_IN_SET (#{deptId},ancestors) )) - ${dataScope} + ${params.dataScope}