From 21e1266a968e52e29637d85c93328b4adc804c7a Mon Sep 17 00:00:00 2001 From: litao Date: Thu, 1 Sep 2022 21:08:10 +0800 Subject: [PATCH] =?UTF-8?q?2022=E5=B9=B49=E6=9C=881=E6=97=A521:07:44?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lims/controller/EntrustController.java | 1 - .../controller/ExamineBasisController.java | 10 ++- .../controller/ExamineItemController.java | 10 ++- .../controller/ExamineResultController.java | 32 +++++---- .../lims/controller/ExamineWayController.java | 10 ++- .../lims/controller/ReagentController.java | 11 ++- .../lims/controller/SimpleRelController.java | 4 +- .../lims/service/impl/EntrustServiceImpl.java | 69 +++++++++++-------- .../system/service/IRoleService.java | 2 + .../system/service/impl/RoleServiceImpl.java | 14 ++++ .../user/controller/UserController.java | 51 +++++++------- .../system/user/mapper/UserMapper.java | 2 +- .../system/user/mapper/UserMapper.xml | 6 ++ .../user/service/impl/UserServiceImpl.java | 17 ++++- 14 files changed, 162 insertions(+), 77 deletions(-) diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/EntrustController.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/EntrustController.java index e981abd..b7d1ca1 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/EntrustController.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/EntrustController.java @@ -1612,7 +1612,6 @@ public class EntrustController extends BladeController { @GetMapping("/simpleReceivePrint") public void simpleReceivePrint(String id, HttpServletResponse response) throws IOException { service.simpleReceivePrint(id, response); - } diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ExamineBasisController.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ExamineBasisController.java index 0b71f06..36bcd60 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ExamineBasisController.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ExamineBasisController.java @@ -90,7 +90,15 @@ public class ExamineBasisController extends BladeController { */ @PostMapping("/insert") @ApiOperation(value = "新增", notes = "新增") - public R insert(@RequestBody ExamineBasis entry) { + public R insert(@RequestBody ExamineBasis entry) throws Exception { + List list = service.list(); + if (list != null && list.size() > 0) { + for (ExamineBasis examineBasis : list) { + if (entry.getName().equals(examineBasis.getName())) { + throw new Exception("名称重复"); + } + } + } entry.setUpdateUser(null); entry.setCreateUser(null); entry.setCreateTime(new Date()); diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ExamineItemController.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ExamineItemController.java index b1b5831..1454659 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ExamineItemController.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ExamineItemController.java @@ -91,7 +91,15 @@ public class ExamineItemController extends BladeController { */ @PostMapping("/insert") @ApiOperation(value = "新增", notes = "新增") - public R insert(@RequestBody ExamineItem entry) { + public R insert(@RequestBody ExamineItem entry) throws Exception { + List list = service.list(); + if (list != null && list.size() > 0) { + for (ExamineItem examineItem : list) { + if (entry.getName().equals(examineItem.getName())) { + throw new Exception("名称重复"); + } + } + } entry.setCreateUser(null); entry.setUpdateUser(null); entry.setCreateTime(new Date()); diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ExamineResultController.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ExamineResultController.java index 9444aa5..307526d 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ExamineResultController.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ExamineResultController.java @@ -1366,24 +1366,20 @@ public class ExamineResultController extends BladeController { private R pcrExcel(MultipartFile file, String examineId) { List read = ExcelUtil.read(file, PCR2Excel.class); if (read != null && read.size() > 0) { - for (PCR2Excel pcrExcel : read) { - if ("".equals(pcrExcel.getCtValue()) || pcrExcel.getCtValue() == null) { - pcrExcel.setCtValue("/"); - pcrExcel.setValue("阴性"); + for (int i = 0; i < read.size(); i++) { + if (i == (read.size() - 1)) { + read.get(i).setCtValue(" " + read.get(i)); + read.get(i).setValue(" 阳性"); } else { - pcrExcel.setValue("阳性"); + if ("".equals(read.get(i).getCtValue()) || read.get(i).getCtValue() == null) { + read.get(i).setCtValue("/"); + read.get(i).setValue("阴性"); + } else { + read.get(i).setCtValue(" " + read.get(i)); + read.get(i).setValue(" 阳性"); + } } } - PCR2Excel pcrExcel1 = new PCR2Excel(); - pcrExcel1.setExperieNum("阴性 对照"); - pcrExcel1.setCtValue(""); - pcrExcel1.setValue("阴性"); - read.add(pcrExcel1); - PCR2Excel pcrExcel2 = new PCR2Excel(); - pcrExcel2.setExperieNum("阳性 对照"); - pcrExcel2.setCtValue(""); - pcrExcel2.setValue("阳性"); - read.add(pcrExcel2); LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(ExamineResult::getExamineId, examineId); ExamineResult result = service.getOne(wrapper); @@ -1557,6 +1553,12 @@ public class ExamineResultController extends BladeController { pcrExcel.setExperieNum(s); list.add(pcrExcel); } + PCRExcel pcrExcel = new PCRExcel(); + pcrExcel.setExperieNum("阴性 对照"); + list.add(pcrExcel); + PCRExcel pcrExcel1 = new PCRExcel(); + pcrExcel1.setExperieNum("阳性 对照"); + list.add(pcrExcel1); ExcelUtil.export(response, "结果模板", "结果模板", list, PCRExcel.class); } // 普通检测 diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ExamineWayController.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ExamineWayController.java index 168a16b..daeb822 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ExamineWayController.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ExamineWayController.java @@ -97,7 +97,15 @@ public class ExamineWayController extends BladeController { * 新增 */ @PostMapping("/insert") - public boolean insertExamine(@RequestBody ExamineWay entry) { + public boolean insertExamine(@RequestBody ExamineWay entry) throws Exception { + List list = service.list(); + if (list != null && list.size() > 0) { + for (ExamineWay examineWay : list) { + if (entry.getName().equals(examineWay.getName())) { + throw new Exception("名称重复"); + } + } + } if (entry.getInstrumentId() != null) { Instrument instrument = instrumentService.getById(entry.getInstrumentId()); entry.setInstrumentName(instrument.getName()); diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ReagentController.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ReagentController.java index 87fe19a..d308221 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ReagentController.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ReagentController.java @@ -16,6 +16,7 @@ import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; import org.springblade.core.tool.utils.StringUtil; import org.springblade.lims.entry.ETask; +import org.springblade.lims.entry.ExamineBasis; import org.springblade.lims.entry.ExamineWay; import org.springblade.lims.entry.Reagent; import org.springblade.lims.service.IETaskService; @@ -71,7 +72,15 @@ public class ReagentController extends BladeController { * */ @PostMapping("/insert") - public boolean insertExamine(@RequestBody Reagent entry) { + public boolean insertExamine(@RequestBody Reagent entry) throws Exception { + List list = service.list(); + if (list != null && list.size() > 0) { + for (Reagent reagent : list) { + if (entry.getName().equals(reagent.getName())) { + throw new Exception("名称重复"); + } + } + } return service.save(entry); } diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/SimpleRelController.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/SimpleRelController.java index 4c6b230..17aa9ff 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/SimpleRelController.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/SimpleRelController.java @@ -59,12 +59,12 @@ public class SimpleRelController extends BladeController { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(SimpleRel::getEntrustId, simpleRel.getEntrustId()); wrapper.eq(SimpleRel::getStatus, 0); - wrapper.orderByAsc(SimpleRel::getSort); +// wrapper.orderByAsc(SimpleRel::getSort); List rels = simpleRelService.list(wrapper); // 3.开始计算 int num = 1; Map> collect = rels.stream().collect(Collectors.groupingBy(SimpleRel::getSort)); - for (int i = 0; i < collect.size(); i++) { + for (int i = 1; i <= collect.size(); i++) { List currSimpleRels = collect.get(i); // 实验的 for (SimpleRel currRel : currSimpleRels) { diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EntrustServiceImpl.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EntrustServiceImpl.java index 00299e2..9bd03d7 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EntrustServiceImpl.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EntrustServiceImpl.java @@ -192,7 +192,8 @@ public class EntrustServiceImpl extends BaseServiceImpl hour1 = "" + hour; } // 检测编号前缀 - String s = "W-" + year + month1 + day1 + hour1 + "-"; + String[] strings = entrust.getAcceptanceNum().split("-"); + String s = strings[1] + year + month1 + day1 + hour1 + "-"; StringBuilder simpleName = new StringBuilder(); Integer simpleCount = 0; @@ -230,7 +231,7 @@ public class EntrustServiceImpl extends BaseServiceImpl simpleRel.setSort(sort); rels.add(simpleRel); } - sort ++; + sort++; } simpleRelService.saveBatch(rels); @@ -689,7 +690,7 @@ public class EntrustServiceImpl extends BaseServiceImpl instrumentName += s2 + ","; } result.put("9", instrumentName); - String value = DictBizCache.getValue(DictBizEnum.SIMPLE_STATUS, examineResult.getSimpleStatus()); + String value = DictBizCache.getValue(DictBizEnum.SIMPLE_STATUS, examineResult.getSimpleStatus()); result.put("10", value); result.put("11", "温度" + examineResult.getTemperature() + "℃; " + "湿度" + examineResult.getHumidity() + "%RH"); result.put("12", examineWay.getOperation()); @@ -704,7 +705,6 @@ public class EntrustServiceImpl extends BaseServiceImpl farView.setHeight(50);//设置高度 farView.setWidth(90);//设置宽度 farView.setType(ImageEntity.Data);//类型 -// farView.setData(getFileStream("http://192.168.1.5:81/static/jianming.PNG")); String s1 = path + user.getElectronicSignature(); System.out.println(s1); FileInputStream fis = null; @@ -803,14 +803,14 @@ public class EntrustServiceImpl extends BaseServiceImpl } if (examineResult.getPicturePath() != null && !"".equals(examineResult.getPicturePath())) { String[] sp = examineResult.getPicturePath().split(","); - for (String s2 : sp) { + for (String picturePath : sp) { Map map = new HashMap<>(); ImageEntity farView1 = new ImageEntity(); - farView1.setHeight(400);//设置高度 - farView1.setWidth(700);//设置宽度 + farView1.setHeight(350);//设置高度 + farView1.setWidth(550);//设置宽度 farView1.setType(ImageEntity.Data);//类型 - String s1 = path + s2; + String s1 = path + picturePath; FileInputStream fis = null; try { fis = new FileInputStream(new File(s1)); @@ -819,9 +819,25 @@ public class EntrustServiceImpl extends BaseServiceImpl } catch (Exception e) { e.printStackTrace(); } - map.put("picture", farView1); + map.put("p", farView1); resultList2.add(map); } +// String picturePath = examineResult.getPicturePath(); +// ImageEntity farView1 = new ImageEntity(); +// farView1.setHeight(350);//设置高度 +// farView1.setWidth(550);//设置宽度 +// farView1.setType(ImageEntity.Data);//类型 +// +// String s1 = path + picturePath; +// FileInputStream fis = null; +// try { +// fis = new FileInputStream(new File(s1)); +// byte[] bytes = readInputStream(fis); +// farView1.setData(bytes); +// } catch (Exception e) { +// e.printStackTrace(); +// } +// result.put("16", farView1); } } result.put("list1", resultList2); @@ -1461,10 +1477,10 @@ public class EntrustServiceImpl extends BaseServiceImpl // 模板地址 // String handleUrl = "C://Users//AAA//Desktop//烁今//打印模板//检测报告2（模板）.docx"; XWPFDocument doc = null; -// FileOutputStream fos = null; + FileOutputStream fos = null; try { doc = WordExportUtil.exportWord07(url, result); -// fos = new FileOutputStream("C://Users//AAA//Desktop//烁今//打印模板//检测报告2.docx"); + fos = new FileOutputStream("C://Users//AAA//Desktop//shuojin//dayin//检测报告2.docx"); String filename = "测试.docx"; response.setContentType("application/octet-stream"); response.setHeader("content-disposition", "attachment;filename=12344.docx"); @@ -1472,21 +1488,21 @@ public class EntrustServiceImpl extends BaseServiceImpl } catch (Exception e) { e.printStackTrace(); } finally { -// if (null != doc) { -//// doc.close(); -// try { -// doc.write(fos); -// } catch (IOException e) { -// e.printStackTrace(); -// } -// } -// if (null != fos) { -// try { -// fos.close(); -// } catch (IOException e) { -// e.printStackTrace(); -// } -// } + if (null != doc) { +// doc.close(); + try { + doc.write(fos); + } catch (IOException e) { + e.printStackTrace(); + } + } + if (null != fos) { + try { + fos.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } if (null != doc) { try { doc.close(); @@ -1895,7 +1911,6 @@ public class EntrustServiceImpl extends BaseServiceImpl for (Simple simple : list1) { Map map = new HashMap<>(); map.put("acceptanceNum", simpleSet.getAcceptanceNum()); - map.put("samplingDate", format.format(simpleSet.getSamplingDate())); map.put("entrustCustomerName", currEntrust.getEntrustCustomerName()); map.put("simpleName", simpleSet.getSimpleName()); diff --git a/lab-service/lab-system/src/main/java/org/springblade/system/service/IRoleService.java b/lab-service/lab-system/src/main/java/org/springblade/system/service/IRoleService.java index 59e6f5f..72eda96 100644 --- a/lab-service/lab-system/src/main/java/org/springblade/system/service/IRoleService.java +++ b/lab-service/lab-system/src/main/java/org/springblade/system/service/IRoleService.java @@ -3,6 +3,7 @@ package org.springblade.system.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; +import org.springblade.core.tool.api.R; import org.springblade.system.entity.Role; import org.springblade.system.vo.RoleVO; @@ -95,4 +96,5 @@ public interface IRoleService extends IService { */ List search(String roleName, Long parentId); + List getRoleName(String alias); } diff --git a/lab-service/lab-system/src/main/java/org/springblade/system/service/impl/RoleServiceImpl.java b/lab-service/lab-system/src/main/java/org/springblade/system/service/impl/RoleServiceImpl.java index 0c353df..f0263bc 100644 --- a/lab-service/lab-system/src/main/java/org/springblade/system/service/impl/RoleServiceImpl.java +++ b/lab-service/lab-system/src/main/java/org/springblade/system/service/impl/RoleServiceImpl.java @@ -208,4 +208,18 @@ public class RoleServiceImpl extends ServiceImpl implements IR return RoleWrapper.build().listNodeVO(roleList); } + @Override + public List getRoleName(String alias) { + List lists = new ArrayList<>(); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(Role::getRoleAlias, alias); + List list = this.list(wrapper); + if (list != null && list.size() > 0) { + for (Role role : list) { + lists.add(role.getRoleName()); + } + } + return lists; + } + } diff --git a/lab-service/lab-user/src/main/java/org/springblade/system/user/controller/UserController.java b/lab-service/lab-user/src/main/java/org/springblade/system/user/controller/UserController.java index c42fea1..76d2f48 100644 --- a/lab-service/lab-user/src/main/java/org/springblade/system/user/controller/UserController.java +++ b/lab-service/lab-user/src/main/java/org/springblade/system/user/controller/UserController.java @@ -140,35 +140,34 @@ public class UserController { /** * 自定义用户列表 */ -// @GetMapping("/page") -// @ApiImplicitParams({ -// @ApiImplicitParam(name = "account", value = "账号名", paramType = "query", dataType = "string"), -// @ApiImplicitParam(name = "realName", value = "姓名", paramType = "query", dataType = "string") -// }) -// @ApiOperationSupport(order = 3) -// @ApiOperation(value = "列表", notes = "传入account和realName") -// //@PreAuth(RoleConstant.HAS_ROLE_ADMIN) -// public R> page(@ApiIgnore User user, Query query, Long deptId, BladeUser bladeUser) { -// IPage pages = userService.selectUserPage(Condition.getPage(query), user, deptId, (bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? StringPool.EMPTY : bladeUser.getTenantId())); -// return R.data(UserWrapper.build().pageVO(pages)); -// } - @GetMapping("/page") - public R> newPage(User user, Query query) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - if (AuthUtil.getUserId() != 1530823299437965313L) { - wrapper.ne(User::getId, 1530823299437965313L); - } - if (user.getDeptId() != null && !"".equals(user.getDeptId())) { - wrapper.eq(User::getDeptId, user.getDeptId()); - } - wrapper.eq(User::getTenantId, AuthUtil.getTenantId()); - wrapper.orderByDesc(User::getCreateTime); - IPage page = userService.page(Condition.getPage(query), wrapper); - return R.data(UserWrapper.build().pageVO(page)); -// return R.data(userService.page(Condition.getPage(query), wrapper)); + @ApiImplicitParams({ + @ApiImplicitParam(name = "account", value = "账号名", paramType = "query", dataType = "string"), + @ApiImplicitParam(name = "realName", value = "姓名", paramType = "query", dataType = "string") + }) + @ApiOperationSupport(order = 3) + @ApiOperation(value = "列表", notes = "传入account和realName") + //@PreAuth(RoleConstant.HAS_ROLE_ADMIN) + public R> page(@ApiIgnore User user, Query query, Long deptId, BladeUser bladeUser) { + IPage pages = userService.selectUserPage(Condition.getPage(query), user, deptId, (bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? StringPool.EMPTY : bladeUser.getTenantId())); + return R.data(UserWrapper.build().pageVO(pages)); } +// @GetMapping("/page") +// public R> newPage(User user, Query query) { +// LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(user); +// if (AuthUtil.getUserId() != 1530823299437965313L) { +// wrapper.ne(User::getId, 1530823299437965313L); +// } +// if (user.getDeptId() != null && !"".equals(user.getDeptId())) { +// wrapper.eq(User::getDeptId, user.getDeptId()); +// } +// wrapper.eq(User::getTenantId, AuthUtil.getTenantId()); +// wrapper.orderByDesc(User::getCreateTime); +// IPage page = userService.page(Condition.getPage(query), wrapper); +// return R.data(UserWrapper.build().pageVO(page)); +// } + /** * 新增或修改 diff --git a/lab-service/lab-user/src/main/java/org/springblade/system/user/mapper/UserMapper.java b/lab-service/lab-user/src/main/java/org/springblade/system/user/mapper/UserMapper.java index b1ef14f..0968db0 100644 --- a/lab-service/lab-user/src/main/java/org/springblade/system/user/mapper/UserMapper.java +++ b/lab-service/lab-user/src/main/java/org/springblade/system/user/mapper/UserMapper.java @@ -26,7 +26,7 @@ public interface UserMapper extends BaseMapper { * @param tenantId * @return */ - List selectUserPage(IPage page, @Param("user") User user, @Param("deptIdList") List deptIdList, @Param("tenantId") String tenantId); + List selectUserPage(IPage page, @Param("user") User user, @Param("deptIdList") List deptIdList, @Param("tenantId") String tenantId, @Param("userIds") List userIds); /** * 获取用户 diff --git a/lab-service/lab-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml b/lab-service/lab-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml index 85fba58..98b9a1c 100644 --- a/lab-service/lab-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml +++ b/lab-service/lab-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml @@ -57,6 +57,12 @@ ) + + and id not in + + #{item} + + ORDER BY id diff --git a/lab-service/lab-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java b/lab-service/lab-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java index 6ed852e..1570b4e 100644 --- a/lab-service/lab-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java +++ b/lab-service/lab-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java @@ -24,6 +24,7 @@ import org.springblade.system.cache.DictCache; import org.springblade.system.cache.ParamCache; import org.springblade.system.cache.SysCache; import org.springblade.system.entity.Dept; +import org.springblade.system.entity.Role; import org.springblade.system.entity.Tenant; import org.springblade.system.enums.DictEnum; import org.springblade.system.feign.ISysClient; @@ -43,6 +44,7 @@ import org.springframework.util.Base64Utils; import java.io.*; import java.util.*; +import java.util.stream.Collectors; import static org.springblade.common.constant.CommonConstant.DEFAULT_PARAM_PASSWORD; @@ -181,7 +183,20 @@ public class UserServiceImpl extends BaseServiceImpl implement @Override public IPage selectUserPage(IPage page, User user, Long deptId, String tenantId) { List deptIdList = SysCache.getDeptChildIds(deptId); - return page.setRecords(baseMapper.selectUserPage(page, user, deptIdList, tenantId)); + String data = sysClient.getRoleAlias(Long.valueOf(AuthUtil.getUser().getRoleId())).getData(); + // 那系统参数角色别名 + String roleAlais = sysClient.getParamValue("hide_role_alias").getData(); + List userIds = new ArrayList<>(); + if (!roleAlais.equals(data)) { + String roleId = sysClient.getRoleIdByAlias(tenantId, roleAlais).getData(); + String roleName = sysClient.getRoleName(Long.valueOf(roleId)).getData(); + System.out.println("roleName: " + roleName); + List users = listRolebyId(roleName); + List collect = users.stream().map(User::getId).collect(Collectors.toList()); + userIds.addAll(collect); + } + System.out.println("userIds: " + userIds); + return page.setRecords(baseMapper.selectUserPage(page, user, deptIdList, tenantId, userIds)); } @Override