From 431b05bf94aefca802a296a1d26bb9fa5ed356ba Mon Sep 17 00:00:00 2001
From: lishiwei <3230787218@qq.com>
Date: Sat, 8 Aug 2026 09:05:36 +0800
Subject: [PATCH] =?UTF-8?q?feat():=20=E6=B7=BB=E5=8A=A0editFlag=E6=9F=A5?=
=?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=EF=BC=8C=E7=A7=BB=E9=99=A4=E5=9B=BA?=
=?UTF-8?q?=E5=AE=9A=E6=91=84=E5=83=8F=E5=A4=B4corpinfoId=E8=BF=87?=
=?UTF-8?q?=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../key/project/command/query/project/KeyProjectQueryExe.java | 1 +
.../src/main/resources/mapper/HiddenPenaltyMapper.xml | 3 +++
.../src/main/resources/mapper/KeyProjectCameraMapper.xml | 3 ---
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/web-app/src/main/java/com/zcloud/key/project/command/query/project/KeyProjectQueryExe.java b/web-app/src/main/java/com/zcloud/key/project/command/query/project/KeyProjectQueryExe.java
index 360234b..429469f 100644
--- a/web-app/src/main/java/com/zcloud/key/project/command/query/project/KeyProjectQueryExe.java
+++ b/web-app/src/main/java/com/zcloud/key/project/command/query/project/KeyProjectQueryExe.java
@@ -264,6 +264,7 @@ public class KeyProjectQueryExe {
penaltyParams.put("pageIndex", 1);
penaltyParams.put("pageSize", 1);
penaltyParams.put("fineFlag", "0");
+ penaltyParams.put("editFlag", "0");
penaltyParams.put("currentUserId", id);
int pCount = hiddenPenaltyRepository.listPage(penaltyParams).getTotalCount();
Long penaltyCount = (long) pCount;
diff --git a/web-infrastructure/src/main/resources/mapper/HiddenPenaltyMapper.xml b/web-infrastructure/src/main/resources/mapper/HiddenPenaltyMapper.xml
index 0a39c00..93cb52c 100644
--- a/web-infrastructure/src/main/resources/mapper/HiddenPenaltyMapper.xml
+++ b/web-infrastructure/src/main/resources/mapper/HiddenPenaltyMapper.xml
@@ -104,6 +104,9 @@
AND hp.fine_flag = #{params.fineFlag}
+
+ AND hp.edit_flag = #{params.editFlag}
+
AND (
hp.create_id = #{params.currentUserId}
diff --git a/web-infrastructure/src/main/resources/mapper/KeyProjectCameraMapper.xml b/web-infrastructure/src/main/resources/mapper/KeyProjectCameraMapper.xml
index 610cb81..84d1437 100644
--- a/web-infrastructure/src/main/resources/mapper/KeyProjectCameraMapper.xml
+++ b/web-infrastructure/src/main/resources/mapper/KeyProjectCameraMapper.xml
@@ -75,9 +75,6 @@
SELECT mc.fixed_camera_id as cameraId, mc.video_name as cameraName, 1 as cameraType
FROM fixed_camera mc
WHERE mc.delete_enum = 'FALSE'
-
- AND mc.corpinfo_id = #{params.corpinfoId}
-
UNION ALL
SELECT mc.mobile_camera_id as cameraId, mc.video_name as cameraName, 2 as cameraType
FROM mobile_camera mc