From 2d0813824f1353ed7e06e5af8f65925e80eec63c Mon Sep 17 00:00:00 2001 From: mashuai Date: Wed, 20 Aug 2025 11:21:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E9=A5=B0=E4=BB=A3=E7=A0=81=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/material/screen/controller/BmConfigController.java | 2 +- .../java/com/bonus/material/ma/controller/TypeController.java | 2 +- .../mapper/material/repair/RepairInputDetailsMapper.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bonus-modules/bonus-material-screen/src/main/java/com/bonus/material/screen/controller/BmConfigController.java b/bonus-modules/bonus-material-screen/src/main/java/com/bonus/material/screen/controller/BmConfigController.java index 6412cdd3..5046ab01 100644 --- a/bonus-modules/bonus-material-screen/src/main/java/com/bonus/material/screen/controller/BmConfigController.java +++ b/bonus-modules/bonus-material-screen/src/main/java/com/bonus/material/screen/controller/BmConfigController.java @@ -41,7 +41,7 @@ public class BmConfigController extends BaseController * 查询功能参数配置列表 */ @ApiOperation(value = "查询功能参数配置列表") - @RequiresPermissions("screen:config:list") + //@RequiresPermissions("screen:config:list") @GetMapping("/list") public TableDataInfo list(BmConfig bmConfig) { diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/TypeController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/TypeController.java index 585d6c5e..6aa25c58 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/TypeController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/TypeController.java @@ -204,7 +204,7 @@ public class TypeController extends BaseController { * 物资类型下拉树 */ @ApiOperation(value = "物资类型下拉树") - @RequiresPermissions("ma:type:list") + //@RequiresPermissions("ma:type:list") @GetMapping("/getMaTypeTreeSelect") public AjaxResult getMaTypeTreeSelect(@RequestParam(required = false, defaultValue = "", value = "typeName") String typeName, @RequestParam(required = false, defaultValue = "", value = "parentId") String parentId) { diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairInputDetailsMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairInputDetailsMapper.xml index 2afe2847..4e73b453 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairInputDetailsMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairInputDetailsMapper.xml @@ -62,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join ma_type mt3 ON mt2.parent_id = mt3.type_id and mt3.del_flag = '0' left join ma_type mt4 ON mt3.parent_id = mt4.type_id and mt4.del_flag = '0' - JOIN ma_type_repair mtr ON mtr.type_id = rd.type_id AND mtr.user_id = #{userId} + JOIN ma_type_keeper mtr ON mtr.type_id = rd.type_id AND mtr.user_id = #{userId} rd.create_time < '2025-08-20 00:00:00'