From 61bdab8a4eee19be9de722c0cb88f75d2fe4f9c7 Mon Sep 17 00:00:00 2001
From: liux <963924687@qq.com>
Date: Mon, 20 Oct 2025 15:47:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E9=93=BE=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../canteen/core/ims/controller/PersonSettingController.java  | 4 +++-
 .../java/com/bonus/canteen/core/ims/model/PersonSetting.java  | 3 +++
 .../src/main/resources/mapper/ims/PersonSettingMapper.xml     | 3 +++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/controller/PersonSettingController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/controller/PersonSettingController.java
index 48fcfa0..94381a2 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/controller/PersonSettingController.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/controller/PersonSettingController.java
@@ -22,7 +22,9 @@ public class PersonSettingController extends BaseController {
     @ApiOperation("供应链人员配置-查询")
     @GetMapping("/getList")
     public TableDataInfo getList(PersonSetting dto) {
-        startPage();
+        if("0".equals(dto.getIsPaging())){
+            startPage();
+        }
         return getDataTable(service.getList(dto));
     }
 
diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/model/PersonSetting.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/model/PersonSetting.java
index b5b549d..4111bd4 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/model/PersonSetting.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/model/PersonSetting.java
@@ -50,4 +50,7 @@ public class PersonSetting {
     @ApiModelProperty(value = "类型")
     @TableField(exist = false)
     private String type;
+
+    @ApiModelProperty("是否分页0是 1否")
+    private Integer isPaging =0;
 }
diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/PersonSettingMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/PersonSettingMapper.xml
index a86a440..9538e33 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/PersonSettingMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/PersonSettingMapper.xml
@@ -20,6 +20,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="id != null">
                 and ips.id = #{id}
             </if>
+            <if test="roleId != null and roleId != ''">
+                and ips.role_id = #{roleId}
+            </if>
             <if test="type != null and type != '' and type == 'supplier'">
                 and ips.role_id = 1
             </if>