From 661f58b325294d94f182e936d764e8decf1c2b02 Mon Sep 17 00:00:00 2001 From: gaowdong Date: Mon, 10 Mar 2025 15:01:18 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B6=85=E5=B8=82=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/bonus/canteen/core/auth/api/MgrAuthApi.java | 1 + .../canteen/core/customer/controller/CustOrgController.java | 4 ++-- .../manage/controller/deprecated/DeviceInfoController.java | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/api/MgrAuthApi.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/api/MgrAuthApi.java index f609a479..0c3a8d98 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/api/MgrAuthApi.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/api/MgrAuthApi.java @@ -40,6 +40,7 @@ import java.util.stream.Collectors; @Service public class MgrAuthApi { + @Autowired private MgrRoleOrgMapper mgrRoleOrgMapper; @Autowired diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/customer/controller/CustOrgController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/customer/controller/CustOrgController.java index 112b9344..5a8de7a6 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/customer/controller/CustOrgController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/customer/controller/CustOrgController.java @@ -4,10 +4,10 @@ import cn.hutool.core.lang.tree.Tree; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.bonus.canteen.core.common.base.BaseController; +import com.bonus.canteen.core.common.utils.AesEncryptUtil; import com.bonus.canteen.core.customer.dto.CustOrgPageDTO; import com.bonus.canteen.core.customer.service.CustOrgService; import com.bonus.canteen.core.customer.vo.CustOrgVO; -import com.bonus.common.houqin.utils.AesEncryptUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; @@ -91,7 +91,7 @@ public class CustOrgController extends BaseController { // } @ApiOperation("商户权限组织树") - @GetMapping({"/tenant/tree"}) + @PostMapping({"/tenant/tree"}) // @RequiresAuthentication public List> getTenantOrgTree() { return this.custOrgService.getTenantOrgTree(); diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/device/manage/controller/deprecated/DeviceInfoController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/device/manage/controller/deprecated/DeviceInfoController.java index f9b4363c..e052f7f3 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/device/manage/controller/deprecated/DeviceInfoController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/device/manage/controller/deprecated/DeviceInfoController.java @@ -124,7 +124,7 @@ public class DeviceInfoController { ) @PostMapping({"/getMachineByPage", "getMachineTypeByPage"}) // @RequiresAuthentication - public PageVO getMachineByPage(@RequestBody String content) { + public PageVO getMachineByPage(@RequestParam String content) { MachineCounterTypeDto oldDto = QueryParseHelper.getParamFromContent(content, MachineCounterTypeDto.class); DeviceSearchDTO param = DeviceDtoConverter.toDeviceSearchDTO(oldDto); PageDTO page = QueryParseHelper.getPageFromContent(content);