From 39739e34af928aae204c55db7974213c9b938c5a Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 21 二月 2024 18:33:14 +0800
Subject: [PATCH] 整理
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java
index 1eb177e..406c8c9 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java
@@ -201,6 +201,7 @@
IPage<DeviceRole> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
QueryWrapper<DeviceRole> queryWrapper = new QueryWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
+ pageWrap.getModel().setIsdeleted(Constants.ZERO);
if (pageWrap.getModel().getId() != null) {
queryWrapper.lambda().eq(DeviceRole::getId, pageWrap.getModel().getId());
}
@@ -233,10 +234,9 @@
if (StringUtils.isNotBlank(pageWrap.getModel().getType())) {
if(pageWrap.getModel().getType().length() > 1) {
String[] types = pageWrap.getModel().getType().split(",");
- queryWrapper.lambda()
- .eq(DeviceRole::getType, types[0])
+ queryWrapper.lambda().and(p-> p.eq(DeviceRole::getType, types[0])
.or()
- .eq(DeviceRole::getType, types[1]);
+ .eq(DeviceRole::getType, types[1]));
}else {
queryWrapper.lambda().eq(DeviceRole::getType, pageWrap.getModel().getType());
}
--
Gitblit v1.9.3