From 4bf6428f22695cd63cedd4d113e8e5955bb7f9c5 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 17 Jan 2022 08:55:18 +0800
Subject: [PATCH] 图片上传工具类修改
---
screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
index 973e952..03a4812 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
@@ -292,14 +292,9 @@
queryWrapper.eq("monitor_point_id", mpId);
}
- //���������������������
- if (name != null) {
- queryWrapper.like("name", name);
- }
-
- //mac������������
- if (mac != null) {
- queryWrapper.like("mac", mac);
+ //���������������mac������������
+ if (name != null && mac != null) {
+ queryWrapper.like("name", name).or().like("mac", mac);
}
//������������,������create_time������
@@ -353,9 +348,11 @@
//������������
deviceInfo.put("extend", device.getExtend());
+ //������������������
+ deviceInfo.put("town", device.getTown());
+
//������
- deviceInfo.put("profession", device.getProfession());
- deviceInfo.put("professionName", device.getProfessionName());
+ deviceInfo.put("professions", device.getProfessions());
//������
deviceInfo.put("tech", device.getTech());
--
Gitblit v1.8.0