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