From 0143b00ead241cc2b894745eff9d8ed5493b0b68 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 13 四月 2022 16:19:04 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityEquipmentService.java | 11 ++++++++---
dao/src/main/java/com/sandu/ximon/dao/mapper/MonitorMapper.java | 2 +-
ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java | 5 ++---
dao/src/main/resources/mapper/WaterQualityEquipmentMapper.xml | 2 +-
dao/src/main/resources/mapper/MonitorMapper.xml | 3 ---
ximon-admin/src/main/java/com/sandu/ximon/admin/security/SecurityUtils.java | 2 +-
6 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/dao/src/main/java/com/sandu/ximon/dao/mapper/MonitorMapper.java b/dao/src/main/java/com/sandu/ximon/dao/mapper/MonitorMapper.java
index 3690503..a7c1df4 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/mapper/MonitorMapper.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/mapper/MonitorMapper.java
@@ -15,7 +15,7 @@
List<Monitor> listMonitorByKeyword1(String keyword, int bindingState1, int bindingState2);
- List<MonitorBo> listMonitorByIds(String keyword, Long clientId, int bindingState, int equipmentState, Long userid);
+ List<MonitorBo> listMonitorByIds(String keyword, int bindingState, int equipmentState, Long userid);
List<String> listMonitorDeviceSerial();
}
diff --git a/dao/src/main/resources/mapper/MonitorMapper.xml b/dao/src/main/resources/mapper/MonitorMapper.xml
index 317d7ce..3bbbc46 100644
--- a/dao/src/main/resources/mapper/MonitorMapper.xml
+++ b/dao/src/main/resources/mapper/MonitorMapper.xml
@@ -62,9 +62,6 @@
OR t1.note LIKE CONCAT(CONCAT('%', #{keyword}), '%')
OR t3.pole_code LIKE CONCAT(CONCAT('%', #{keyword}), '%')
</if>
- <if test="clientId != null">
- AND t3.client_id = #{clientId}
- </if>
<if test="bindingState != 2">
AND t1.binding_state = #{bindingState}
</if>
diff --git a/dao/src/main/resources/mapper/WaterQualityEquipmentMapper.xml b/dao/src/main/resources/mapper/WaterQualityEquipmentMapper.xml
index 6fe2d84..1e93afc 100644
--- a/dao/src/main/resources/mapper/WaterQualityEquipmentMapper.xml
+++ b/dao/src/main/resources/mapper/WaterQualityEquipmentMapper.xml
@@ -41,7 +41,7 @@
AND t3.pole_name LIKE CONCAT(CONCAT('%', #{keyword}), '%')
</if>
<if test="clientId != null">
- AND t3.client_id = #{clientId}
+ AND (t3.user_id = #{clientId} OR t3.client_id = #{clientId})
</if>
</where>
</select>
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/security/SecurityUtils.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/security/SecurityUtils.java
index e5c38ac..d85bf94 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/security/SecurityUtils.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/security/SecurityUtils.java
@@ -82,7 +82,7 @@
if (loginUserInfo == null) {
return null;
}
- if (AdministratorEnums.CUSTOMER.getCode().equals(loginUserInfo.getAdministratorType())) {
+ if (!AdministratorEnums.ADMIN.getCode().equals(loginUserInfo.getAdministratorType())) {
return loginUserInfo.getUserId();
}
return null;
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java
index 6fb3213..382e7d3 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java
@@ -55,7 +55,6 @@
* 妯＄硦鏌ヨ
*/
public List<MonitorBo> listMonitorByKeyword(BaseConditionVO baseConditionVO, MonitorParam monitorParam) {
- Long clientId = SecurityUtils.getClientId();
PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
List<MonitorBo> monitorList;
//缁戝畾鐘舵�侊細宸茬粦瀹�/鏈粦瀹�/鍏ㄩ儴
@@ -71,10 +70,10 @@
//涓虹┖鏄秴绠�
if (SecurityUtils.getClientId() == null) {
- monitorList = monitorMapper.listMonitorByIds(monitorParam.getKeyword(), clientId
+ monitorList = monitorMapper.listMonitorByIds(monitorParam.getKeyword()
, monitorParam.getBindingState(), monitorParam.getEquipmentState(), null);
} else {
- monitorList = monitorMapper.listMonitorByIds(monitorParam.getKeyword(), clientId
+ monitorList = monitorMapper.listMonitorByIds(monitorParam.getKeyword()
, monitorParam.getBindingState(), monitorParam.getEquipmentState(), SecurityUtils.getUserId());
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityEquipmentService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityEquipmentService.java
index 80ad2e7..3d6e5d2 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityEquipmentService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityEquipmentService.java
@@ -38,10 +38,15 @@
* 妯＄硦鏌ヨ
*/
public List<WaterQualityEquipmentBo> listWaterQualityEquipmentByKeyword(BaseConditionVO baseConditionVO, String keyword) {
- Long clientId = SecurityUtils.getClientId();
+ Long userId = SecurityUtils.getUserId();
PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
-
- List<WaterQualityEquipmentBo> waterQualityEquipmentBoList = waterQualityEquipmentMapper.listWaterQualityEquipmentByIds(keyword, clientId);
+ List<WaterQualityEquipmentBo> waterQualityEquipmentBoList;
+ //涓虹┖鏄秴绠�
+ if (SecurityUtils.getClientId() == null) {
+ waterQualityEquipmentBoList = waterQualityEquipmentMapper.listWaterQualityEquipmentByIds(keyword, null);
+ } else {
+ waterQualityEquipmentBoList = waterQualityEquipmentMapper.listWaterQualityEquipmentByIds(keyword, userId);
+ }
return waterQualityEquipmentBoList;
}
--
Gitblit v1.9.3