Merge remote-tracking branch 'origin/master'

jwtech-admin-page/src/views/system/dict/index.vue

@@ -112,15 +112,15 @@
           >导出</el-button
         >
       </el-col>
-      <!-- <el-col :span="1.5">
+       <el-col :span="1.5">
         <el-button
           type="danger"
           icon="el-icon-refresh"
           size="mini"
           @click="handleClearCache"
           v-hasPermi="['system:dict:remove']"
-        >清理缓存</el-button>
-      </el-col> -->
+        >刷新缓存</el-button>
+      </el-col>
       <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
@@ -479,7 +479,7 @@ export default {
     handleClearCache() {
       clearCache().then((response) => {
         if (response.code === 200) {
-          this.msgSuccess("清理成功");
+          this.msgSuccess("刷新成功");
         }
       });
     },

jwtech-system/src/main/java/com/kms/system/service/SysDictTypeService.java

@@ -41,8 +41,14 @@ public class SysDictTypeService extends BaseService<SysDictTypeMapper,SysDictTyp
         List<SysDictType> dictTypeList = dictTypeMapper.selectDictTypeAll();
         for (SysDictType dictType : dictTypeList)
         {
+            if("bad_credit_behavior".equals(dictType.getDictType())){
+                System.out.println(1);
+            }
             List<SysDictData> dictDatas = dictDataMapper.selectDictDataByType(dictType.getDictType());
             DictUtils.setDictCache(dictType.getDictType(), dictDatas);
+            if("bad_credit_behavior".equals(dictType.getDictType())){
+                System.out.println(1);
+            }
         }
     }
 
@@ -80,6 +86,7 @@ public class SysDictTypeService extends BaseService<SysDictTypeMapper,SysDictTyp
         {
             return dictDatas;
         }
+        //找不到读库
         dictDatas = dictDataMapper.selectDictDataByType(dictType);
         if (StringUtils.isNotEmpty(dictDatas))
         {
@@ -141,6 +148,19 @@ public class SysDictTypeService extends BaseService<SysDictTypeMapper,SysDictTyp
     public void clearCache()
     {
         DictUtils.clearDictCache();
+
+        List<SysDictType> dictTypeList = dictTypeMapper.selectDictTypeAll();
+        for (SysDictType dictType : dictTypeList)
+        {
+            if("bad_credit_behavior".equals(dictType.getDictType())){
+                System.out.println(1);
+            }
+            List<SysDictData> dictDatas = dictDataMapper.selectDictDataByType(dictType.getDictType());
+            DictUtils.setDictCache(dictType.getDictType(), dictDatas);
+            if("bad_credit_behavior".equals(dictType.getDictType())){
+                System.out.println(1);
+            }
+        }
     }
 
     /**