Merge branch 'refs/heads/dev'

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

@@ -126,10 +126,10 @@ 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);
+                    List<String> chekckIdsList = new ArrayList<>();
                     if (CollectionUtils.isEmpty(jobList)) {//不存在任务记录
                         e.setTimes(0);
                     } else {

zfjg-modules/zfjg-manage/src/main/resources/mapper/other/EnforceObjArchitectureRelateMapper.xml

@@ -44,7 +44,7 @@
             enforce_job
         WHERE
          job_type in ('NORMAL','SPECIAL','REPORT','REVIEW','BRIGADE','OTHER')
-          and job_status='ARCHIVED'
+          and job_status='ARCHIVED' and is_deleted = 0
          and enforce_obj_id in
         <foreach collection="enforceObjIds" item="enforceObjId" open="(" separator="," close=")">
             #{enforceObjId}