Merge remote-tracking branch 'origin/dev' into dev

.drone.yml

@@ -60,7 +60,7 @@ steps:
         - export PATH=/usr/local/bin:$PATH
         - echo $PATH
         - pkill -9 java
-        - nohup java -jar /www/wwwroot/railway.iamsee.com/release/railway-admin/target/railway-admin.jar > /www/wwwroot/railway.iamsee.com/out.log 2>&1 &
+        - nohup java -jar /www/wwwroot/railway.iamsee.com/release/railway-admin/target/railway-admin.jar -Ddruid.mysql.usePingMethod=false > /www/wwwroot/railway.iamsee.com/out.log 2>&1 &
 trigger:
   branch:
     - dev

pom.xml

@@ -27,7 +27,7 @@
     <java.version>1.8</java.version>
     <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
     <shiro.version>1.8.0</shiro.version>
-    <druid.version>1.2.6</druid.version>
+    <druid.version>1.2.8</druid.version>
     <bitwalker.version>1.21</bitwalker.version>
     <kaptcha.version>2.3.2</kaptcha.version>
     <swagger.version>3.0.0</swagger.version>

railway-framework/src/main/java/com/railway/framework/aspectj/DataScopeAspect.java

@@ -102,7 +102,8 @@ public class DataScopeAspect {
           sqlString.append(StringUtils.format(" OR {}.user_id = {} ", userAlias, user.getUserId()));
         } else {
           // 数据权限为仅本人且没有userAlias别名不查询任何数据
-          sqlString.append(" OR 1=0 ");
+          // sqlString.append(" OR 1=0 ")
+          sqlString.append(StringUtils.format(" OR {}.dept_id = (select dept_id from sys_user where user_id = {}) ", deptAlias, user.getUserId()));
         }
       }
     }

railway-system/src/main/java/com/railway/system/service/impl/SysDeptServiceImpl.java

@@ -80,7 +80,7 @@ public class SysDeptServiceImpl implements ISysDeptService {
    * @return 部门信息集合
    */
   @Override
-  @DataScope(deptAlias = "d", userAlias = "u")
+  @DataScope(deptAlias = "d")
   public List<SysDept> selectDeptList(SysDept dept) {
     return deptMapper.selectDeptList(dept);
   }

railway-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -31,7 +31,6 @@
     d.email, d.status, d.del_flag, d.create_by, d.create_time, d.remark, t.user_count,
     d.dept_type, dict.dict_label as dept_type_text
     from sys_dept d
-    left join sys_user u on u.dept_id = d.dept_id
     left join sys_dict_data dict on d.dept_type = dict.dict_value and dict.dict_type = 'deptType'
     left join (select dept_id, count(*) as user_count from sys_user where del_flag = '0' group by dept_id) t on t.dept_id = d.dept_id
   </sql>