From e265fd71f866680a23248bf54575083cedb531ed Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 11 十二月 2025 08:50:13 +0800
Subject: [PATCH] 钥匙柜开门添加 指纹方式

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java |   14 +++-----------
 1 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java
index 59db8f6..86c0622 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java
@@ -617,23 +617,15 @@
             if(Objects.isNull(jkCabinet)){
                 return jkCabinetGridList;
             }
-            if(Constants.equalsInteger(jkCabinet.getDoubleAuth(),Constants.ONE)){
-                if(StringUtils.isBlank(jkCabinet.getAuthMemberId())){
+            if(Constants.equalsInteger(jkCabinet.getDoubleAuth(),Constants.ONE)&&Constants.equalsInteger(dto.getType(),Constants.ZERO)){
+                if(StringUtils.isBlank(jkCabinet.getAuthMemberId())||Objects.isNull(dto.getAutoMemberId())){
                     return jkCabinetGridList;
                 }
                 List<String> authMemberList =  Arrays.asList(jkCabinet.getAuthMemberId().split(","));
-                Boolean flag = true;
-                for (String id:authMemberList) {
-                    if(Arrays.asList(jkCabinet.getAuthMemberId().split(",")).contains(id)){
-                        flag = false;
-                        break;
-                    }
-                }
-                if(flag){
+                if(!authMemberList.contains(dto.getAutoMemberId())){
                     return jkCabinetGridList;
                 }
             }
-
             //濡傛灉鏄繕閽ュ寵 鍒欑洿鎺ユ煡璇㈠凡鍊熷嚭鐨勯挜鍖欑殑鏁版嵁
             if(Constants.equalsInteger(dto.getType(),Constants.ONE)){
                 jkCabinetGridList = jkCabinetGridMapper.selectJoinList(JkCabinetGrid.class,

--
Gitblit v1.9.3