bug fix

zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/service/impl/other/EnforceObjArchitectureRelateServiceImpl.java

@@ -116,48 +116,50 @@ public class EnforceObjArchitectureRelateServiceImpl extends ServiceImpl<Enforce
                 List<EnforceObjChangeArchitectureDTO> hisList = enforceObjArchitectureRelateMapper.getEnforceObjChangeArchitectureDTOList(enforceObjIds,query.getArchitectureUuid());
                 Map<String, List<EnforceObjChangeArchitectureDTO>> hisMap = hisList.stream().collect(Collectors.groupingBy(EnforceObjChangeArchitectureDTO::getEnforceObjId));
                 List<String> chekckIdsList = new ArrayList<>();
-                list.forEach(e->{
-                    String enforceObjId = e.getEnforceObjId();
-                    List<EnforceJobObjDTO> jobList = jobMap.get(enforceObjId);
-                    if (CollectionUtils.isEmpty(jobList)) {//不存在任务记录
-                        e.setTimes(0);
-                    }else{
-                        List<EnforceObjChangeArchitectureDTO> changeList = hisMap.get(enforceObjId);
-                        int changeListSize = changeList.size();
-                        if (changeListSize % 2 == 0) {//偶数
-                            for (int i = 0; i < changeListSize; i++) {
-                                if (i % 2 == 0) {
-                                    for (int j = 0; j < jobList.size(); j++) {
-                                        Date jobTime = jobList.get(j).getCreateTime();
-                                        if (jobTime.compareTo(changeList.get(i).getCreateTime())>0 && changeList.get(i+1).getCreateTime().compareTo(jobTime)>0) {
-                                            chekckIdsList.add(String.valueOf(jobList.get(j).getEnforceJobId()));
-                                        }
-                                    }
-                                }
-                            }
-                        }else{//奇数
-                            for (int i = 0; i < changeListSize; i++) {
-                                if (i == changeListSize - 1) {//最后一个
-                                    for (int j = 0; j < jobList.size(); j++) {
-                                        Date jobTime = jobList.get(j).getCreateTime();
-                                        if (jobTime.compareTo(changeList.get(i).getCreateTime())>0) {
-                                            chekckIdsList.add(String.valueOf(jobList.get(j).getEnforceJobId()));
+                list.forEach(e-> {
+                            String enforceObjId = e.getEnforceObjId();
+                            List<EnforceJobObjDTO> jobList = jobMap.get(enforceObjId);
+                            if (CollectionUtils.isEmpty(jobList)) {//不存在任务记录
+                                e.setTimes(0);
+                            } else {
+                                List<EnforceObjChangeArchitectureDTO> changeList = hisMap.get(enforceObjId);
+                                if (CollectionUtils.isNotEmpty(changeList)) {
+                                int changeListSize = changeList.size();
+                                if (changeListSize % 2 == 0) {//偶数
+                                    for (int i = 0; i < changeListSize; i++) {
+                                        if (i % 2 == 0) {
+                                            for (int j = 0; j < jobList.size(); j++) {
+                                                Date jobTime = jobList.get(j).getCreateTime();
+                                                if (jobTime.compareTo(changeList.get(i).getCreateTime()) > 0 && changeList.get(i + 1).getCreateTime().compareTo(jobTime) > 0) {
+                                                    chekckIdsList.add(String.valueOf(jobList.get(j).getEnforceJobId()));
+                                                }
+                                            }
                                         }
                                     }
-                                }else{
-                                    if (i % 2 == 0) {
-                                        for (int j = 0; j < jobList.size(); j++) {
-                                            Date jobTime = jobList.get(j).getCreateTime();
-                                            if (jobTime.compareTo(changeList.get(i).getCreateTime())>0 && changeList.get(i+1).getCreateTime().compareTo(jobTime)>0) {
-                                                chekckIdsList.add(String.valueOf(jobList.get(j).getEnforceJobId()));
+                                } else {//奇数
+                                    for (int i = 0; i < changeListSize; i++) {
+                                        if (i == changeListSize - 1) {//最后一个
+                                            for (int j = 0; j < jobList.size(); j++) {
+                                                Date jobTime = jobList.get(j).getCreateTime();
+                                                if (jobTime.compareTo(changeList.get(i).getCreateTime()) > 0) {
+                                                    chekckIdsList.add(String.valueOf(jobList.get(j).getEnforceJobId()));
+                                                }
+                                            }
+                                        } else {
+                                            if (i % 2 == 0) {
+                                                for (int j = 0; j < jobList.size(); j++) {
+                                                    Date jobTime = jobList.get(j).getCreateTime();
+                                                    if (jobTime.compareTo(changeList.get(i).getCreateTime()) > 0 && changeList.get(i + 1).getCreateTime().compareTo(jobTime) > 0) {
+                                                        chekckIdsList.add(String.valueOf(jobList.get(j).getEnforceJobId()));
+                                                    }
+                                                }
                                             }
                                         }
                                     }
                                 }
+
                             }
                         }
-
-                    }
                     e.setTimes(chekckIdsList.size());
                     e.setCheckIds(chekckIdsList.stream().collect(Collectors.joining(",")));
                 });