BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 50ac363682595f6d0bcca3e68e0bea6af9617aaa

Authored by RuoYi
1 parent f84b1574

升级druid到最新版本v1.1.23

Inline Side-by-side
Showing 3 changed files with 6 additions and 9 deletions
... ... @@ -18,7 +18,7 @@
18 18 <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
19 19 <java.version>1.8</java.version>
20 20 <mybatis.boot.version>1.3.2</mybatis.boot.version>
21   - <druid.version>1.1.14</druid.version>
  21 + <druid.version>1.1.23</druid.version>
22 22 <bitwalker.version>1.19</bitwalker.version>
23 23 <swagger.version>2.9.2</swagger.version>
24 24 <kaptcha.version>2.3.2</kaptcha.version>
... ...
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
  View file @50ac363
... ... @@ -79,14 +79,11 @@ public class DataScopeAspect
79 79 }
80 80 // 获取当前的用户
81 81 LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
82   - if (loginUser == null) {
83   - return;
84   - }
85   - SysUser currentUser = loginUser.getUser();
86   - if (currentUser != null)
  82 + if (StringUtils.isNotNull(loginUser))
87 83 {
  84 + SysUser currentUser = loginUser.getUser();
88 85 // 如果是超级管理员，则不过滤数据
89   - if (!currentUser.isAdmin())
  86 + if (StringUtils.isNotNull(currentUser) && !currentUser.isAdmin())
90 87 {
91 88 dataScopeFilter(joinPoint, currentUser, controllerDataScope.deptAlias(),
92 89 controllerDataScope.userAlias());
... ...
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
  View file @50ac363
... ... @@ -76,12 +76,12 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
76 76 public List<SysDictData> selectDictDataByType(String dictType)
77 77 {
78 78 List<SysDictData> dictDatas = DictUtils.getDictCache(dictType);
79   - if (null!=dictDatas&&!dictDatas.isEmpty())
  79 + if (StringUtils.isNotEmpty(dictDatas))
80 80 {
81 81 return dictDatas;
82 82 }
83 83 dictDatas = dictDataMapper.selectDictDataByType(dictType);
84   - if (null!=dictDatas&&!dictDatas.isEmpty())
  84 + if (StringUtils.isNotEmpty(dictDatas))
85 85 {
86 86 DictUtils.setDictCache(dictType, dictDatas);
87 87 return dictDatas;
... ...