From 8450be4c0368fdc1763349412c9d7593e7cdefe1 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Mon, 17 Jun 2024 09:51:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=87=BA=E5=85=A5=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../screen/service/impl/AccessMgeServiceImpl.java         | 8 ++++----
 .../src/main/resources/mapper/VideoMapper.xml             | 6 ++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/AccessMgeServiceImpl.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/AccessMgeServiceImpl.java
index 72846c0..84376bf 100644
--- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/AccessMgeServiceImpl.java
+++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/AccessMgeServiceImpl.java
@@ -90,7 +90,8 @@ public class AccessMgeServiceImpl implements AccessMgeService {
             dto.setTypeCode(Constant.PERSON_CAR_TYPE);
             list = mapper.getPerStatisticsPhoto(dto);
             if(CollectionUtils.isNotEmpty(list)){
-                for (AccessMgeVo vo : list) {
+                for (int i = 0;i < list.size();i++) {
+                    AccessMgeVo vo = list.get(i);
                     if(StringUtils.isNotEmpty(vo.getVal())){
                         Result<SysFile> result = remoteFileService.getImgBase64(vo.getVal(), SecurityConstants.INNER);
                         if (result != null && result.getCode() == HttpStatus.SUCCESS && result.getData() != null) {
@@ -101,11 +102,10 @@ public class AccessMgeServiceImpl implements AccessMgeService {
                         }
                         vo.setPersonName(handleData(vo.getSourceData()));
                     }
-                    if(Objects.equals("0",vo.getIsWarn()) || StringUtils.isEmpty(vo.getIsWarn())){
+                    if(i == 0 || i == 1){
                         noWarnList.add(vo);
-                    }else if(Objects.equals("1",vo.getIsWarn())){
-                        warnList.add(vo);
                     }
+                    warnList.add(vo);
                 }
             }
         } catch (Exception e) {
diff --git a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/VideoMapper.xml b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/VideoMapper.xml
index 524652d..513e207 100644
--- a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/VideoMapper.xml
+++ b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/VideoMapper.xml
@@ -15,13 +15,11 @@
             FROM   t_class_metting tcm
             left  JOIN tb_device td   	on td.device_code = tcm.puid AND td.del_flag=0
             WHERE tcm.del_flag = 0   AND TCM.puid is not null
+            AND tcm.bid_code = #{bidCode}
             <!--  AND  tcm.work_day = CURRENT_DATE-->
-        <if test="param!=null and param!=''">
+            <if test="param!=null and param!=''">
                 AND INSTR(td.device_name,#{param}) > 0
             </if>
-            <if test="bidCode!=null and bidCode!=''">
-                AND INSTR(tcm.bid_code,#{bidCode}) > 0
-            </if>
             <if test="bidCode==null or bidCode==''">
                 AND tcm.bid_code = '-1'
             </if>