From 97136aecc9af26003271643f5c3eb12b1e4491b9 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Wed, 21 Aug 2024 16:50:10 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E6=96=99=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sgzb/app/controller/BackReceiveController.java    |  8 ++++++++
 .../main/resources/mapper/system/SysUserMapper.xml    | 11 ++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java
index e836869..2cbb035 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java
@@ -312,4 +312,12 @@ public class BackReceiveController extends BaseController {
             throw new RuntimeException(e);
         }
     }
+
+//    @Log(title = "退料接收记录（编码接收）-web", businessType = BusinessType.INSERT)
+//    @GetMapping("backReceiveRecordWebPt")
+//    public AjaxResult backReceiveRecordWebPt(@RequestBody BackApplyInfo record) {
+//        startPage();
+//        List<BackApplyInfo> list = backReceiveService.backReceiveRecordWebPt(record);
+//        return AjaxResult.success(getDataTable(list));
+//    }
 }
diff --git a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysUserMapper.xml b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysUserMapper.xml
index 706b6bf..ee91812 100644
--- a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -167,7 +167,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		WHERE
 			u.STATUS = '0'
 		  AND u.del_flag = '0'
-		  AND r.role_id = #{roleId}
+			<if test="roleId != null">
+				AND r.role_id = #{roleId}
+			</if>
+
+			<if test="roleIds != null">
+				AND r.role_id in
+				<foreach item="roleId" collection="roleIds" open="(" separator="," close=")">
+					#{roleId}
+				</foreach>
+			</if>
 	</select>
 
 	<insert id="insertUser" parameterType="com.bonus.sgzb.system.api.domain.SysUser" useGeneratedKeys="true" keyProperty="userId">