From e793ee8fde410e0dc9534c1a9916d9059f560afa Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期四, 07 三月 2024 17:54:08 +0800
Subject: [PATCH] 整理
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java | 7 +++----
1 files changed, 3 insertions(+), 4 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 7fa419f..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
@@ -27,7 +27,6 @@
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
-import org.checkerframework.checker.units.qual.C;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
@@ -202,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());
}
@@ -234,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