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 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} + + AND r.role_id = #{roleId} + + + + AND r.role_id in + + #{roleId} + +