安全风险分析bug

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/hazard/service/impl/THazardAssessmentServiceImpl.java

@@ -59,44 +59,56 @@ public class THazardAssessmentServiceImpl extends SuperServiceImpl<THazardAssess
         THazardAssessment tHazardAssessment = null;
         final int MAX_ATTEMPTS = 5;
 
-        if (StringUtils.isEmpty(completeTime)) {
-            // 构建不含时间条件的查询
-            tHazardAssessment = this.getOne(
-                    new LambdaQueryWrapper<THazardAssessment>()
-                            .eq(THazardAssessment::getWorkTypeId, typeId)
-                            .eq(THazardAssessment::getPlanId, planId)
-            );
-        } else {
-            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        int count = this.count(
+                new LambdaQueryWrapper<THazardAssessment>()
+                        .eq(THazardAssessment::getWorkTypeId, typeId)
+                        .eq(THazardAssessment::getPlanId, planId));
+        if(count>1){
+            if (StringUtils.isEmpty(completeTime)) {
+                // 构建不含时间条件的查询
+                tHazardAssessment = this.getOne(
+                        new LambdaQueryWrapper<THazardAssessment>()
+                                .eq(THazardAssessment::getWorkTypeId, typeId)
+                                .eq(THazardAssessment::getPlanId, planId)
+                );
+            } else {
+                DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
 
-            // 尝试原始时间
-            tHazardAssessment = this.getOne(
-                    new LambdaQueryWrapper<THazardAssessment>()
-                            .eq(THazardAssessment::getWorkTypeId, typeId)
-                            .eq(THazardAssessment::getPlanId, planId)
-                            .eq(THazardAssessment::getCreateDate, completeTime)
-            );
+                // 尝试原始时间
+                tHazardAssessment = this.getOne(
+                        new LambdaQueryWrapper<THazardAssessment>()
+                                .eq(THazardAssessment::getWorkTypeId, typeId)
+                                .eq(THazardAssessment::getPlanId, planId)
+                                .eq(THazardAssessment::getCreateDate, completeTime)
+                );
 
-            // 时间递减查询（最多5次）
-            if (tHazardAssessment == null) {
-                LocalDateTime dateTime = LocalDateTime.parse(completeTime, formatter);
+                // 时间递减查询（最多5次）
+                if (tHazardAssessment == null) {
+                    LocalDateTime dateTime = LocalDateTime.parse(completeTime, formatter);
 
-                for (int i = 1; i <= MAX_ATTEMPTS; i++) {
-                    // 每次递减1秒
-                    LocalDateTime adjustedTime = dateTime.minusSeconds(i);
-                    String newTime = adjustedTime.format(formatter);
+                    for (int i = 1; i <= MAX_ATTEMPTS; i++) {
+                        // 每次递减1秒
+                        LocalDateTime adjustedTime = dateTime.minusSeconds(i);
+                        String newTime = adjustedTime.format(formatter);
 
-                    // 每次创建全新的查询条件
-                    tHazardAssessment = this.getOne(
-                            new LambdaQueryWrapper<THazardAssessment>()
-                                    .eq(THazardAssessment::getWorkTypeId, typeId)
-                                    .eq(THazardAssessment::getPlanId, planId)
-                                    .eq(THazardAssessment::getCreateDate, newTime)
-                    );
+                        // 每次创建全新的查询条件
+                        tHazardAssessment = this.getOne(
+                                new LambdaQueryWrapper<THazardAssessment>()
+                                        .eq(THazardAssessment::getWorkTypeId, typeId)
+                                        .eq(THazardAssessment::getPlanId, planId)
+                                        .eq(THazardAssessment::getCreateDate, newTime)
+                        );
 
-                    if (tHazardAssessment != null) break;
+                        if (tHazardAssessment != null) break;
+                    }
                 }
             }
+        }else{
+            tHazardAssessment = this.getOne(
+                    new LambdaQueryWrapper<THazardAssessment>()
+                            .eq(THazardAssessment::getWorkTypeId, typeId)
+                            .eq(THazardAssessment::getPlanId, planId)
+            );
         }
 
         if(tHazardAssessment == null){