From 5aa8fa4083b8a9bfb38123c27a42cf58518fac68 Mon Sep 17 00:00:00 2001
From: lishuai <260038442@qq.com>
Date: 星期五, 15 十二月 2023 18:24:36 +0800
Subject: [PATCH] 访客和普通门禁组
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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 225392d..02c9be2 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
@@ -52,8 +52,8 @@
// 鑾峰彇涔嬪墠鏄惁瀛樺湪榛樿闂ㄧ缁�
DeviceRole newDeviceRole = null;
- if(Constants.ONE == deviceRole.getStatus()) {
- newDeviceRole = getDeviceRole(deviceRole.getStatus());
+ if(Constants.ONE == deviceRole.getStatus() && null != deviceRole.getType()) {
+ newDeviceRole = getDeviceRole(deviceRole.getStatus(), deviceRole.getType());
}
LoginUserInfo loginUserInfo = (LoginUserInfo)SecurityUtils.getSubject().getPrincipal();
if(null != newDeviceRole) {
@@ -118,8 +118,8 @@
public void updateStatusById(DeviceRole deviceRole) {
// 鑾峰彇涔嬪墠鏄惁瀛樺湪榛樿闂ㄧ缁�
DeviceRole newDeviceRole = null;
- if(Constants.ZERO == deviceRole.getIsDefault()) {
- newDeviceRole = getDeviceRole(deviceRole.getIsDefault());
+ if(Constants.ONE == deviceRole.getStatus() && null != deviceRole.getType()) {
+ newDeviceRole = getDeviceRole(deviceRole.getStatus(), deviceRole.getType());
}
LoginUserInfo loginUserInfo = (LoginUserInfo)SecurityUtils.getSubject().getPrincipal();
List<DeviceRole> deviceRoleList = new ArrayList<>();
@@ -145,10 +145,11 @@
}
}
- private DeviceRole getDeviceRole(Integer status) {
+ private DeviceRole getDeviceRole(Integer status, Integer type) {
LambdaQueryWrapper<DeviceRole> query = new LambdaQueryWrapper<>();
query.eq(DeviceRole::getIsdeleted,Constants.ZERO)
.eq(DeviceRole::getIsDefault,Constants.ZERO)
+ .eq(DeviceRole::getType,type)
.eq(DeviceRole::getStatus,status);
// 鏌ヨ鏄惁鏈夐粯璁ら棬绂佺粍锛屽彧鑳芥湁涓�缁勯粯璁ら棬绂佺粍
DeviceRole getDeviceRole = deviceRoleMapper.selectOne(query);
--
Gitblit v1.9.3