From bc2cda03481cd62a1b04959d2653678053e60b18 Mon Sep 17 00:00:00 2001 From: liukangdong <898885815@qq.com> Date: 星期五, 31 五月 2024 18:23:35 +0800 Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit --- server/system_service/src/main/java/com/doumee/api/cloud/SystemDictDataCloudController.java | 11 ++--------- 1 files changed, 2 insertions(+), 9 deletions(-) diff --git a/server/system_service/src/main/java/com/doumee/api/cloud/SystemDictDataCloudController.java b/server/system_service/src/main/java/com/doumee/api/cloud/SystemDictDataCloudController.java index 5d21cfe..ffdaee2 100644 --- a/server/system_service/src/main/java/com/doumee/api/cloud/SystemDictDataCloudController.java +++ b/server/system_service/src/main/java/com/doumee/api/cloud/SystemDictDataCloudController.java @@ -46,6 +46,7 @@ @CloudRequiredPermission("system:dict:update") public ApiResponse create(@Validated(OperaType.Create.class) @RequestBody SystemDictData systemDictData,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) { systemDictData.setLoginUserInfo(this.getLoginUser(token)); + systemDictData.setCreateUser(systemDictData.getLoginUserInfo().getId()); return ApiResponse.success(systemDictDataBiz.create(systemDictData)); } @@ -75,6 +76,7 @@ @CloudRequiredPermission("system:dict:update") public ApiResponse updateById(@Validated(OperaType.Update.class) @RequestBody SystemDictData systemDictData,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) { systemDictData.setLoginUserInfo(this.getLoginUser(token)); + systemDictData.setUpdateUser(systemDictData.getLoginUserInfo().getId()); systemDictDataBiz.updateById(systemDictData); return ApiResponse.success(null); } @@ -84,15 +86,6 @@ @CloudRequiredPermission("system:dict:update") public ApiResponse<PageData<SystemDictDataListVO>> findPage (@RequestBody PageWrap<QuerySystemDictDataDTO> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) { return ApiResponse.success(systemDictDataService.findPage(pageWrap)); - } - - - @ApiOperation("鏌ヨ鍜栬眴浠诲姟瑙勫垯") - @PostMapping("/findAllList") - @CloudRequiredPermission("system:dict:update") - public ApiResponse findAllList (@RequestBody PageWrap<QuerySystemDictDataDTO> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) { - List<SystemDictData> list= systemDictDataBiz.queryListByCode(Constants.COFFEE_BEAN_TASK,null); - return ApiResponse.success(list); } -- Gitblit v1.9.3