Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

疯狂的狮子li

2020-09-07 ef95cec77f31d2f909d0344572f662e54d428673

Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue


 Conflicts:

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

	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java

	ruoyi-ui/src/components/Editor/index.vue

 pom.xml

@@ -18,7 +18,7 @@
        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

        <java.version>1.8</java.version>

        <mybatis.boot.version>1.3.2</mybatis.boot.version>

        <druid.version>1.1.14</druid.version>

        <druid.version>1.1.23</druid.version>

        <bitwalker.version>1.19</bitwalker.version>

        <swagger.version>2.9.2</swagger.version>

        <kaptcha.version>2.3.2</kaptcha.version>


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

@@ -79,11 +79,11 @@
        }
        // 获取当前的用户
        LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
        SysUser currentUser = loginUser.getUser();
        if (currentUser != null)
        if (StringUtils.isNotNull(loginUser))
        {
            SysUser currentUser = loginUser.getUser();
            // 如果是超级管理员，则不过滤数据
            if (!currentUser.isAdmin())
            if (StringUtils.isNotNull(currentUser) && !currentUser.isAdmin())
            {
                dataScopeFilter(joinPoint, currentUser, controllerDataScope.deptAlias(),
                        controllerDataScope.userAlias());

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java

@@ -76,12 +76,12 @@
    public List<SysDictData> selectDictDataByType(String dictType)
    {
        List<SysDictData> dictDatas = DictUtils.getDictCache(dictType);
        if (StringUtils.isNotNull(dictDatas))
        if (StringUtils.isNotEmpty(dictDatas))
        {
            return dictDatas;
        }
        dictDatas = dictDataMapper.selectDictDataByType(dictType);
        if (StringUtils.isNotNull(dictDatas))
        if (StringUtils.isNotEmpty(dictDatas))
        {
            DictUtils.setDictCache(dictType, dictDatas);
            return dictDatas;

 ruoyi-ui/src/components/Editor/index.vue

@@ -71,9 +71,9 @@
    value: {
      handler(val) {
        if (val !== this.currentValue) {
          this.currentValue = val;
          this.currentValue = val === null ? "" : val;
          if (this.Quill) {
            this.Quill.pasteHTML(this.value);
            this.Quill.pasteHTML(this.currentValue);
          }
        }
      },
@@ -192,4 +192,4 @@
.ql-snow .ql-picker.ql-font .ql-picker-item[data-value="monospace"]::before {
  content: "等宽字体";
}
</style>
</style>