Pre Merge pull request !401 from D哥/N/A

解决数据权限过滤处理逻辑中，莫名其妙添加AND (d.dept_id = 0)的问题。
修改前生成sql语句：
SELECT d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time, d.tenant_id FROM sys_dept d WHERE d.del_flag = '0' AND (d.dept_id = 0) ORDER BY d.parent_id, d.order_num

修改后生成sql语句：
SELECT d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time, d.tenant_id FROM sys_dept d WHERE d.del_flag = '0' ORDER BY d.parent_id, d.order_num

Signed-off-by: D哥 <12271764+darrenteng@user.noreply.gitee.com>

ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/aspect/DataScopeAspect.java

@@ -113,9 +113,10 @@ public class DataScopeAspect
             }
             if (DATA_SCOPE_ALL.equals(dataScope))
             {
+                // 全部数据权限，不添加额外条件
                 sqlString = new StringBuilder();
-                conditions.add(dataScope);
+                conditions.clear();
-                break;
+                return;
             }
             else if (DATA_SCOPE_CUSTOM.equals(dataScope))
             {
@@ -143,28 +144,28 @@ public class DataScopeAspect
                 {
                     sqlString.append(StringUtils.format(" OR {}.user_id = {} ", userAlias, user.getUserId()));
                 }
-                else
+                // 当没有 userAlias 时，不添加任何条件
-                {
-                    // 数据权限为仅本人且没有userAlias别名不查询任何数据
-                    sqlString.append(StringUtils.format(" OR {}.dept_id = 0 ", deptAlias));
-                }
             }
             conditions.add(dataScope);
         }
 
-        // 角色都不包含传递过来的权限字符，这个时候sqlString也会为空，所以要限制一下,不查询任何数据
+        // 角色都不包含传递过来的权限字符，这个时候不添加任何条件
         if (StringUtils.isEmpty(conditions))
         {
-            sqlString.append(StringUtils.format(" OR {}.dept_id = 0 ", deptAlias));
+            sqlString = new StringBuilder();
         }
 
-        if (StringUtils.isNotBlank(sqlString.toString()))
+        String sql = sqlString.toString().trim();
+        if (sql.startsWith("OR ")) {
+            sql = sql.substring(3);
+        }
+        if (StringUtils.isNotBlank(sql))
         {
             Object params = joinPoint.getArgs()[0];
-            if (StringUtils.isNotNull(params) && params instanceof BaseEntity)
+            if (params instanceof BaseEntity)
             {
                 BaseEntity baseEntity = (BaseEntity) params;
-                baseEntity.getParams().put(DATA_SCOPE, " AND (" + sqlString.substring(4) + ")");
+                baseEntity.getParams().put(DATA_SCOPE, " AND (" + sql + ")");
             }
         }
     }
@@ -181,4 +182,4 @@ public class DataScopeAspect
             baseEntity.getParams().put(DATA_SCOPE, "");
         }
     }
-}
+}

ruoyi-ui/src/assets/styles/ruoyi.scss

@@ -130,12 +130,10 @@
   border-radius: 4px;
 }
 
-/* el menu */
+/* horizontal el menu */
-.el-menu-item,
+.el-menu--horizontal .el-menu-item .svg-icon + span,
-.el-sub-menu {
+.el-menu--horizontal .el-submenu__title .svg-icon + span {
-  .svg-icon + span {
+  margin-left: 3px;
-    margin-left: 5px;
-  }
 }
 
 .el-menu--horizontal .el-menu--popup {

ruoyi-ui/src/assets/styles/sidebar.scss

@@ -116,15 +116,17 @@
       margin-left: 54px;
     }
 
-    .submenu-title-noDropdown {
+    .el-menu:not(.el-menu--horizontal) {
-      padding: 0 !important;
+      .submenu-title-noDropdown {
-      position: relative;
-
-      .el-tooltip {
         padding: 0 !important;
+        position: relative;
 
-        .svg-icon {
+        .el-tooltip {
-          margin-left: 20px;
+          padding: 0 !important;
+
+          .svg-icon {
+            margin-left: 20px;
+          }
         }
       }
     }

ruoyi-ui/src/layout/components/AppMain.vue

@@ -80,6 +80,39 @@ export default {
     min-height: 0px;
   }
 }
+
+/* 移动端fixed-header优化 */
+@media screen and (max-width: 991px) {
+  .fixed-header + .app-main {
+    padding-bottom: max(60px, calc(constant(safe-area-inset-bottom) + 40px));
+    padding-bottom: max(60px, calc(env(safe-area-inset-bottom) + 40px));
+    overscroll-behavior-y: none;
+  }
+
+  .hasTagsView .fixed-header + .app-main {
+    padding-bottom: max(60px, calc(constant(safe-area-inset-bottom) + 40px));
+    padding-bottom: max(60px, calc(env(safe-area-inset-bottom) + 40px));
+    overscroll-behavior-y: none;
+  }
+}
+
+@supports (-webkit-touch-callout: none) {
+  @media screen and (max-width: 991px) {
+    .fixed-header + .app-main {
+      padding-bottom: max(17px, calc(constant(safe-area-inset-bottom) + 10px));
+      padding-bottom: max(17px, calc(env(safe-area-inset-bottom) + 10px));
+      height: calc(100svh - 50px);
+      height: calc(100dvh - 50px);
+    }
+
+    .hasTagsView .fixed-header + .app-main {
+      padding-bottom: max(17px, calc(constant(safe-area-inset-bottom) + 10px));
+      padding-bottom: max(17px, calc(env(safe-area-inset-bottom) + 10px));
+      height: calc(100svh - 84px);
+      height: calc(100dvh - 84px);
+    }
+  }
+}
 </style>
 
 <style lang="scss">

ruoyi-ui/src/layout/components/TopBar/index.vue

@@ -60,36 +60,22 @@ export default {
 </script>
 
 <style lang="scss">
-.topbar-menu.el-menu--horizontal > .el-menu-item {
+/* menu item */
-  float: left;
+.topbar-menu.el-menu--horizontal .el-submenu__title, .topbar-menu.el-menu--horizontal .el-menu-item {
-  height: 50px !important;
+  padding: 0 10px !important;
-  line-height: 50px !important;
-  color: #303133 !important;
-  padding: 0 5px !important;
-  margin: 0 10px !important;
 }
 
-.el-menu-item.is-active .svg-icon + span, .el-submenu.is-active .svg-icon + span{
+.el-menu--horizontal .el-menu--popup .el-menu-item:hover {
-  color: v-bind(theme);
+  background-color: #f5f7fa !important;
-}
-
-.el-menu--horizontal .el-menu .el-menu-item, .el-menu--horizontal .el-menu .el-submenu__title {
-  color: #303133 !important;
 }
 
 /* submenu item */
 .topbar-menu.el-menu--horizontal > .el-submenu .el-submenu__title {
   float: left;
-  height: 50px !important;
+  height: 47px !important;
   line-height: 50px !important;
-  color: #303133 !important;
+  color: #303133;
-  padding: 0 5px !important;
+  margin: 0 15px !important;
-  margin: 0 10px !important;
-}
-
-/* 图标右间距 */
-.topbar-menu .svg-icon {
-  margin-right: 4px;
 }
 
 /* topbar more arrow */ 
@@ -103,6 +89,10 @@ export default {
 /* menu__title el-menu-item */
 .topbar-menu.el-menu--horizontal .el-submenu__title, .topbar-menu.el-menu--horizontal .el-menu-item {
   height: 55px;
-  padding: 0 15px;
+}
+
+.el-menu--horizontal .el-menu .el-menu-item, .el-menu--horizontal .el-menu .el-submenu__title{
+  color: #303133;
 }
 </style>
+

ruoyi-ui/src/settings.js

@@ -32,7 +32,7 @@ module.exports = {
   /**
    * 是否固定头部
    */
-  fixedHeader: false,
+  fixedHeader: true,
 
   /**
    * 是否显示logo