From 2f6d2c44cead9ab98df7119250ed922b8c849c67 Mon Sep 17 00:00:00 2001 From: zzw <wander.zheng@qq.com> Date: 星期五, 17 十一月 2023 17:08:44 +0800 Subject: [PATCH] 编号 --- zt/core/src/main/java/com/zt/modules/sys/controller/SysDictTypeController.java | 4 ++-- web/src/views/layout/main.vue | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/web/src/views/layout/main.vue b/web/src/views/layout/main.vue index fe7ddf3..bee8a2b 100644 --- a/web/src/views/layout/main.vue +++ b/web/src/views/layout/main.vue @@ -92,6 +92,7 @@ if (res.data != null) { this.$store.state.word = res.data } + console.log(this.$store.state.word,'this.$store.state.word') }, goSingleSign() { let username = this.$route.query.username diff --git a/zt/core/src/main/java/com/zt/modules/sys/controller/SysDictTypeController.java b/zt/core/src/main/java/com/zt/modules/sys/controller/SysDictTypeController.java index 311c39c..cdef189 100644 --- a/zt/core/src/main/java/com/zt/modules/sys/controller/SysDictTypeController.java +++ b/zt/core/src/main/java/com/zt/modules/sys/controller/SysDictTypeController.java @@ -153,7 +153,7 @@ */ @GetMapping("getDictMap") @ApiOperation("瀛楀吀Map") - public Map<String, String> getDictMap(@RequestParam String dictType) { + public Result<Map<String, String>> getDictMap(@RequestParam String dictType) { List<DictDto> userDicts = sysDictTypeService.getUserDicts(); DictDto dict = userDicts.stream() @@ -163,6 +163,6 @@ for (DictItemDto dictItemDto : ((DictLeafDto) dict).getDataList()) { keywordMap.put(dictItemDto.getDictLabel(), dictItemDto.getRemark()); } - return keywordMap; + return Result.ok(keywordMap); } } -- Gitblit v1.9.1